From 7e8edf7f0f52169cbda36b45dfa67db2d3e34eab Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Thu, 19 Sep 2019 10:24:20 +0200 Subject: vFW DT tutorial improvements - Fixed workflow script for osdf request - ansible_inventory file generation added - Licence for upload policy script Change-Id: Ia46d19750569f649ce12dcdb49571299d87d8fee Signed-off-by: Lukasz Rajewski Issue-ID: INT-751 (cherry picked from commit e659e3afec2f3987d071510efe63e72374ef1a88) --- tutorials/vFWDT/workflow/workflow.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) mode change 100644 => 100755 tutorials/vFWDT/workflow/workflow.py (limited to 'tutorials/vFWDT/workflow') diff --git a/tutorials/vFWDT/workflow/workflow.py b/tutorials/vFWDT/workflow/workflow.py old mode 100644 new mode 100755 index 455bd29d..ef3700ae --- a/tutorials/vFWDT/workflow/workflow.py +++ b/tutorials/vFWDT/workflow/workflow.py @@ -73,6 +73,7 @@ class BaseServer(http.server.BaseHTTPRequestHandler): self.end_headers() data = simplejson.loads(self.data_string) + #print(json.dumps(data, indent=4)) self.osdf_resp["last"]["data"] = data self.osdf_resp["last"]["id"] = data["requestId"] with open("response.json", "w") as outfile: @@ -352,9 +353,11 @@ def _osdf_request(rancher_ip, onap_ip, aai_data, exclude, use_oof_cache): if exclude: template["placementInfo"]["placementDemands"][0]["excludedCandidates"][0]["identifiers"].\ append(aai_data['vf-module-id']) + del template["placementInfo"]["placementDemands"][0]["requiredCandidates"] else: template["placementInfo"]["placementDemands"][0]["requiredCandidates"][0]["identifiers"].\ append(aai_data['vf-module-id']) + del template["placementInfo"]["placementDemands"][0]["excludedCandidates"] #print(json.dumps(template, indent=4)) @@ -792,10 +795,16 @@ def execute_workflow(vfw_vnf_id, rancher_ip, onap_ip, use_oof_cache, if_close_lo print(json.dumps(aai_data, indent=4)) lcm_requests = build_appc_lcms_requests_body(rancher_ip, onap_ip, aai_data, use_oof_cache, if_close_loop_vfw) print("\nAnsible Inventory:") + inventory = "[host]\nlocalhost ansible_connection=local\n" for key in ansible_inventory: - print("[{}]".format(key)) + inventory += str("[{}]\n").format(key) for host in ansible_inventory[key]: - print(ansible_inventory[key][host]) + inventory += str("{}\n").format(ansible_inventory[key][host]) + + print(inventory) + f = open("Ansible_inventory", 'w+') + f.write(inventory) + f.close() if info_only: return -- cgit 1.2.3-korg