diff options
| -rwxr-xr-x | tutorials/vFWDT/policies/rules/uploadPolicies.sh | 17 | ||||
| -rwxr-xr-x[-rw-r--r--] | tutorials/vFWDT/workflow/workflow.py | 13 |
2 files changed, 28 insertions, 2 deletions
diff --git a/tutorials/vFWDT/policies/rules/uploadPolicies.sh b/tutorials/vFWDT/policies/rules/uploadPolicies.sh index 3200ba94..7d1ccd12 100755 --- a/tutorials/vFWDT/policies/rules/uploadPolicies.sh +++ b/tutorials/vFWDT/policies/rules/uploadPolicies.sh @@ -1,5 +1,22 @@ #!/bin/bash +# ============LICENSE_START======================================================= +# Copyright (C) 2019 Orange +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ============LICENSE_END========================================================= + `./yq > /dev/null 2>&1` if [ $? -ne 0 ]; then diff --git a/tutorials/vFWDT/workflow/workflow.py b/tutorials/vFWDT/workflow/workflow.py index 455bd29d..ef3700ae 100644..100755 --- 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 |