From aed35c43eb5f2ef80abb61f2eb2ad431ba6002a0 Mon Sep 17 00:00:00 2001 From: forest Date: Thu, 9 Dec 2021 17:42:53 -0600 Subject: [PATCH] pass email correctly in net_set_dhcp --- capsulflask/hub_model.py | 2 +- capsulflask/spoke_api.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/capsulflask/hub_model.py b/capsulflask/hub_model.py index be418b2..07279dc 100644 --- a/capsulflask/hub_model.py +++ b/capsulflask/hub_model.py @@ -278,7 +278,7 @@ class CapsulFlaskHub(VirtualizationInterface): result_status = None host = get_model().host_by_id(host_id) if host is not None: - payload = json.dumps(dict(type="net_set_dhcp", network_name=network_name, macs=macs, remove_ipv4=remove_ipv4, add_ipv4=add_ipv4)) + payload = json.dumps(dict(type="net_set_dhcp", email=email, network_name=network_name, macs=macs, remove_ipv4=remove_ipv4, add_ipv4=add_ipv4)) results = self.synchronous_operation([host], email, payload) result_json_string = "" for result in results: diff --git a/capsulflask/spoke_api.py b/capsulflask/spoke_api.py index 39d1fed..c8548ef 100644 --- a/capsulflask/spoke_api.py +++ b/capsulflask/spoke_api.py @@ -227,7 +227,7 @@ def handle_vm_state_command(operation_id, request_body): def handle_net_set_dhcp(operation_id, request_body): - required_properties = ['network_name', 'macs'] + required_properties = ['email', 'network_name', 'macs'] for required_property in required_properties: if required_property not in request_body: current_app.logger.error(f"/hosts/operation returned 400: {required_property} is required for net_set_dhcp")