diff options
Diffstat (limited to 'tutorials/vFWDT')
| -rw-r--r-- | tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json | 32 | ||||
| -rw-r--r-- | tutorials/vFWDT/policies/rules/affinity_vFW_TD.json | 29 | ||||
| -rwxr-xr-x | tutorials/vFWDT/policies/rules/uploadPolicies.sh | 58 | ||||
| -rw-r--r-- | tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json | 41 | ||||
| -rw-r--r-- | tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json | 41 | ||||
| -rw-r--r-- | tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml | 58 | ||||
| -rw-r--r-- | tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml | 43 | ||||
| -rw-r--r-- | tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml | 68 | ||||
| -rw-r--r-- | tutorials/vFWDT/workflow/requirements.txt | 4 | ||||
| -rw-r--r-- | tutorials/vFWDT/workflow/templates/hasRequest.json | 4 | ||||
| -rw-r--r-- | tutorials/vFWDT/workflow/workflow.py | 261 |
11 files changed, 621 insertions, 18 deletions
diff --git a/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json new file mode 100644 index 00000000..300ac99d --- /dev/null +++ b/tutorials/vFWDT/policies/rules/QueryPolicy_vFW_TD.json @@ -0,0 +1,32 @@ +{ + "service": "queryPolicy", + "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD", + "description": "Query policy for vFW TD", + "templateVersion": "OpenSource.version.1", + "version": "OpenSource.version.1", + "priority": "3", + "riskType": "test", + "riskLevel": "2", + "guard": "False", + "content": { + "queryProperties": [ + {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1}, + {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2}, + {"attribute":"chosen_region", "attribute_location": "chosenRegion"}, + {"attribute":"chosen_customer_id", "attribute_location": "chosenCustomerId"} + ], + "policyScope": [ + "td", + "us", + "vFW-SINK", + "vPGN" + ], + "policyType": "request_param_query", + "serviceName": "vFW_TD", + "identity": "vFW_TD_Query_Policy", + "resources": [ + "vFW-SINK", + "vPGN" + ] + } +} diff --git a/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json b/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json new file mode 100644 index 00000000..590de1c9 --- /dev/null +++ b/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json @@ -0,0 +1,29 @@ +{ + "service": "affinityPolicy", + "policyName": "OSDF_DUBLIN.Affinity_vFW_TD", + "description": "Affinity policy for vPGN Anchor and vFW destination point", + "templateVersion": "OpenSource.version.1", + "version": "OpenSource.version.1", + "priority": "3", + "riskType": "test", + "riskLevel": "2", + "guard": "False", + "content": { + "identity": "affinity_vFW_TD", + "policyScope": [ + "td", + "us", + "vFW-SINK", + "vPGN" + ], + "affinityProperty": { + "qualifier": "same", + "category": "region" + }, + "policyType": "zone", + "resources": [ + "vFW-SINK", + "vPGN" + ] + } +} diff --git a/tutorials/vFWDT/policies/rules/uploadPolicies.sh b/tutorials/vFWDT/policies/rules/uploadPolicies.sh new file mode 100755 index 00000000..3200ba94 --- /dev/null +++ b/tutorials/vFWDT/policies/rules/uploadPolicies.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +`./yq > /dev/null 2>&1` + +if [ $? -ne 0 ]; then + echo "Install yq" + wget -cO yq https://github.com/mikefarah/yq/releases/download/2.4.0/yq_linux_amd64 + chmod 755 yq +fi + +`jo -p n=1 > /dev/null 2>&1` + +if [ $? -ne 0 ]; then + echo "Install jo" + sudo add-apt-repository -y ppa:duggan/jo + sudo apt update + sudo apt install jo -y +fi + +echo "Uploading policies" + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +PDP=`kubectl get pods -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}' | grep policy-pdp` + +echo $PDP +CMD='createPolicy' +MODE=$1 + +if [[ $MODE == "U" ]]; then + CMD='updatePolicy' +fi + +echo $CMD +SCRIPT="dt-policies.sh" +echo "#!/bin/bash" > $SCRIPT + +for f in $DIR/*.json; do + NAME=`./yq r $f policyName` + SCOPE="$(cut -d'.' -f1 <<< $NAME )" + RULE=`cat $f` + BODY="\"$RULE\"" + echo "Processing $NAME rule.."; + echo "echo \"$NAME Policy\"" >> $SCRIPT + BODY=`jo -p configBody="$BODY" -p policyName=$NAME -p policyConfigType=MicroService -p onapName=SampleDemo -p policyScope=$SCOPE` + LINK="curl -k -v -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '$BODY' 'https://localhost:8081/pdp/api/$CMD'" + LINK="${LINK/\"\\\"{\\n/\"{}" + LINK="${LINK/\\\"\"/\"}" + LINK="${LINK//\\n/ }" + echo "$LINK" >> $SCRIPT + BODY=`jo -p policyType=MicroService -p pdpGroup=default -p policyName=$NAME` + LINK="curl -k -v -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '$BODY' 'https://localhost:8081/pdp/api/pushPolicy'" + echo "$LINK" >> $SCRIPT +done + +`kubectl cp $SCRIPT onap/$PDP:/tmp/policy-install` +`kubectl exec $PDP -- chmod 755 $SCRIPT` +`kubectl exec $PDP -- ./$SCRIPT` + diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json new file mode 100644 index 00000000..8df45e33 --- /dev/null +++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json @@ -0,0 +1,41 @@ +{ + "service": "vnfPolicy", + "policyName": "OSDF_DUBLIN.vnfPolicy_vFW_TD", + "description": "vnfPolicy", + "templateVersion": "OpenSource.version.1", + "version": "OpenSource.version.1", + "priority": "6", + "riskType": "test", + "riskLevel": "3", + "guard": "False", + "content": { + "identity": "vnf_vFW_TD", + "policyScope": [ + "td", + "us", + "vFW-SINK" + ], + "policyType": "vnfPolicy", + "resources": ["vFW-SINK"], + "applicableResources": "any", + "vnfProperties": [{ + "inventoryProvider": "aai", + "serviceType": "", + "inventoryType": "vfmodule", + "customerId": { + "get_param": "chosen_customer_id" + }, + "equipmentRole": "", + "attributes": { + "orchestrationStatus": ["active"], + "provStatus": "ACTIVE", + "cloudRegionId": { + "get_param": "chosen_region" + }, + "service_instance_id": { + "get_param": "service_id" + } + } + }] + } +} diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json new file mode 100644 index 00000000..452fdb63 --- /dev/null +++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vPGN_TD.json @@ -0,0 +1,41 @@ +{ + "service": "vnfPolicy", + "policyName": "OSDF_DUBLIN.vnfPolicy_vPGN_TD", + "description": "vnfPolicy", + "templateVersion": "OpenSource.version.1", + "version": "OpenSource.version.1", + "priority": "6", + "riskType": "test", + "riskLevel": "3", + "guard": "False", + "content": { + "identity": "vnf_vPGN_TD", + "policyScope": [ + "td", + "us", + "vPGN" + ], + "policyType": "vnfPolicy", + "resources": ["vPGN"], + "applicableResources": "any", + "vnfProperties": [{ + "inventoryProvider": "aai", + "serviceType": "", + "inventoryType": "vfmodule", + "customerId": { + "get_param": "chosen_customer_id" + }, + "equipmentRole": "", + "attributes": { + "orchestrationStatus": ["active"], + "provStatus": "ACTIVE", + "cloudRegionId": { + "get_param": "chosen_region" + }, + "service_instance_id": { + "get_param": "service_id" + } + } + }] + } +} diff --git a/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml b/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml new file mode 100644 index 00000000..89a3e9d5 --- /dev/null +++ b/tutorials/vFWDT/policies/types/affinityPolicy-v20181031.yml @@ -0,0 +1,58 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + policy.nodes.affinityPolicy: + derived_from: policy.nodes.Root + properties: + policyScope: + type: list + description: scope where the policy is applicable + required: true + matchable: true + entry_schema: + type: string + policyType: + type: list + description: type of a policy + required: true + matchable: true + entry_schema: + type: string + consraints: + - valid_values: + - zone + identity: + type: string + required: true + applicableResources: + type: list + required: true + entry_schema: + type: string + constraints: + - valid_values: + - any + - all + affinityProperties: + type: policy.data.affinityProperties_properties + required: true + resources: + type: list + required: true + entry_schema: + type: string +data_types: + policy.data.affinityProperties_properties: + derived_from: tosca.nodes.Root + properties: + qualifier: + type: list + required: true + entry_schema: + type: string + constraints: + - valid_values: + - same + - different + category: + type: string + required: true diff --git a/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml b/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml new file mode 100644 index 00000000..09824db9 --- /dev/null +++ b/tutorials/vFWDT/policies/types/queryPolicy-v20181031.yml @@ -0,0 +1,43 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + policy.nodes.queryPolicy: + derived_from: policy.nodes.Root + properties: + policyScope: + type: list + description: scope where the policy is applicable + required: true + matchable: true + entry_schema: + type: string + policyType: + type: list + description: type of a policy + required: true + matchable: true + entry_schema: + type: string + consraints: + - valid_values: + - request_param_query + identity: + type: string + required: true + queryProperties: + type: list + required: true + entry_schema: + type:policy.data.queryProperties_properties +data_types: + policy.data.queryProperties_properties: + derived_from: tosca.nodes.Root + properties: + attribute: + type: string + required: true + value: + type: string + required: true + attribute_location: + type: string + required: true diff --git a/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml b/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml new file mode 100644 index 00000000..4ce3b9fb --- /dev/null +++ b/tutorials/vFWDT/policies/types/vnfPolicy-v20181031.yml @@ -0,0 +1,68 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + policy.nodes.vnfPolicy: + derived_from: policy.nodes.Root + properties: + policyScope: + type: list + description: scope where the policy is applicable + required: true + matchable: true + entry_schema: + type: string + policyType: + type: list + description: type of a policy + required: true + matchable: true + entry_schema: + type: string + consraints: + - valid_values: + - vnfPolicy + identity: + type: string + required: true + resources: + type: list + required: true + entry_schema: + type: string + applicableResources: + type: list + required: true + entry_schema: + type: string + constraints: + - valid_values: + - any + - all + vnfProperties: + type: list + required: true + entry_schema: + type:policy.data.vnfProperties_properties +data_types: + policy.data.vnfProperties_properties: + derived_from: tosca.nodes.Root + properties: + inventoryProvider: + type: string + required: true + serviceType: + type: string + required: true + inventoryType: + type: list + required: true + entry_schema: + type: string + constraints: + - valid_values: + - serviceInstanceId + - vnfName + - cloudRegionId + - vimId + customerId: + type: string + required: true diff --git a/tutorials/vFWDT/workflow/requirements.txt b/tutorials/vFWDT/workflow/requirements.txt index 2b2e8209..5d55655f 100644 --- a/tutorials/vFWDT/workflow/requirements.txt +++ b/tutorials/vFWDT/workflow/requirements.txt @@ -1,3 +1,5 @@ netifaces>=0.10.9 simple-rest-client>=0.5.4 -basicauth>=0.4.1
\ No newline at end of file +basicauth>=0.4.1 +simplejson>=0.0.2 +ifaddr>=0.1.6
\ No newline at end of file diff --git a/tutorials/vFWDT/workflow/templates/hasRequest.json b/tutorials/vFWDT/workflow/templates/hasRequest.json index a58d4dd9..c9d77637 100644 --- a/tutorials/vFWDT/workflow/templates/hasRequest.json +++ b/tutorials/vFWDT/workflow/templates/hasRequest.json @@ -54,11 +54,11 @@ "service_type": "vFW-SINK-XX", "excluded_candidates": [{ "inventory_type": "vfmodule", - "candidate_id": "e765d576-8755-4145-8536-0bb6d9b1dc9a" + "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"] }], "required_candidates": [{ "inventory_type": "vfmodule", - "candidate_id": "e765d576-8755-4145-8536-0bb6d9b1dc9a" + "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"] }] }], "vPGN": [{ diff --git a/tutorials/vFWDT/workflow/workflow.py b/tutorials/vFWDT/workflow/workflow.py index f34448cb..455bd29d 100644 --- a/tutorials/vFWDT/workflow/workflow.py +++ b/tutorials/vFWDT/workflow/workflow.py @@ -29,6 +29,9 @@ import netifaces as ni import warnings import contextlib import requests +import simplejson +import http.server +import threading from datetime import datetime from datetime import timedelta from simple_rest_client.api import API @@ -43,8 +46,45 @@ old_merge_environment_settings = requests.Session.merge_environment_settings hostname_cache = [] ansible_inventory = {} +osdf_response = {"last": { "id": "id", "data": None}} +class BaseServer(http.server.BaseHTTPRequestHandler): + + def __init__(self, one, two, three): + self.osdf_resp = osdf_response + super().__init__(one, two, three) + + def _set_headers(self): + self.send_response(200) + self.send_header('Content-type', 'application/json') + self.end_headers() + + def do_GET(self): + self._set_headers() + + def do_HEAD(self): + self._set_headers() + + def do_POST(self): + self._set_headers() + self.data_string = self.rfile.read(int(self.headers['Content-Length'])) + self.send_response(200) + self.end_headers() + + data = simplejson.loads(self.data_string) + self.osdf_resp["last"]["data"] = data + self.osdf_resp["last"]["id"] = data["requestId"] + with open("response.json", "w") as outfile: + simplejson.dump(data, outfile) + + +def _run_osdf_resp_server(): + server_address = ('', 9000) + httpd = http.server.HTTPServer(server_address, BaseServer) + print('Starting OSDF Response Server...') + httpd.serve_forever() + @contextlib.contextmanager def _no_ssl_verification(): opened_adapters = set() @@ -143,6 +183,12 @@ class HASApiResource(Resource): } +class OSDFApiResource(Resource): + actions = { + 'placement': {'method': 'POST', 'url': 'placement'} + } + + class APPCLcmApiResource(Resource): actions = { 'distribute_traffic': {'method': 'POST', 'url': 'appc-provider-lcm:distribute-traffic/'}, @@ -189,6 +235,25 @@ def _init_python_has_api(onap_ip): return api +def _init_python_osdf_api(onap_ip): + api = API( + api_root_url="https://{}:30248/api/oof/v1/".format(onap_ip), + params={}, + headers={ + 'Authorization': encode("test", "testpwd"), + 'X-FromAppId': 'SCRIPT', + 'Accept': 'application/json', + 'Content-Type': 'application/json', + 'X-TransactionId': str(uuid.uuid4()), + }, + timeout=30, + append_slash=False, + json_encode_body=True # encode body as json + ) + api.add_resource(resource_name='osdf', resource_class=OSDFApiResource) + return api + + def _init_python_appc_lcm_api(onap_ip): api = API( api_root_url="http://{}:30230/restconf/operations/".format(onap_ip), @@ -255,6 +320,75 @@ def load_aai_data(vfw_vnf_id, onap_ip): return aai_data +def _osdf_request(rancher_ip, onap_ip, aai_data, exclude, use_oof_cache): + dirname = os.path.join('templates/oof-cache/', aai_data['vf-module-id']) + if exclude: + file = os.path.join(dirname, 'sample-osdf-excluded.json') + else: + file = os.path.join(dirname, 'sample-osdf-required.json') + if use_oof_cache and os.path.exists(file): + migrate_from = json.loads(open(file).read()) + return migrate_from + + print('Making OSDF request for excluded {}'.format(str(exclude))) + api = _init_python_osdf_api(onap_ip) + request_id = str(uuid.uuid4()) + transaction_id = str(uuid.uuid4()) + callback_url = "http://{}:9000/osdfCallback/".format(str(rancher_ip)) + template = json.loads(open('templates/osdfRequest.json').read()) + template["requestInfo"]["transactionId"] = transaction_id + template["requestInfo"]["requestId"] = request_id + template["requestInfo"]["callbackUrl"] = callback_url + template["serviceInfo"]["serviceInstanceId"] = aai_data['service-info']['service-instance-id'] + template["placementInfo"]["requestParameters"]["chosenCustomerId"] = aai_data['service-info']['global-customer-id'] + template["placementInfo"]["placementDemands"][0]["resourceModelInfo"]["modelInvariantId"] =\ + aai_data['vfw-model-info']['model-invariant-id'] + template["placementInfo"]["placementDemands"][0]["resourceModelInfo"]["modelVersionId"] =\ + aai_data['vfw-model-info']['model-version-id'] + template["placementInfo"]["placementDemands"][1]["resourceModelInfo"]["modelInvariantId"] =\ + aai_data['vpgn-model-info']['model-invariant-id'] + template["placementInfo"]["placementDemands"][1]["resourceModelInfo"]["modelVersionId"] =\ + aai_data['vpgn-model-info']['model-version-id'] + if exclude: + template["placementInfo"]["placementDemands"][0]["excludedCandidates"][0]["identifiers"].\ + append(aai_data['vf-module-id']) + else: + template["placementInfo"]["placementDemands"][0]["requiredCandidates"][0]["identifiers"].\ + append(aai_data['vf-module-id']) + + #print(json.dumps(template, indent=4)) + + with _no_ssl_verification(): + response = api.osdf.placement(body=template, params={}, headers={}) + #if response.body.get('error_message') is not None: + # raise Exception(response.body['error_message']['explanation']) + + counter = 0 + while counter < 600 and osdf_response["last"]["id"] != request_id: + time.sleep(1) + if counter % 20 == 0: + print("solving") + counter += 1 + + if osdf_response["last"]["id"] == request_id: + status = osdf_response["last"]["data"]["requestStatus"] + if status == "completed": + result = { + "solution": osdf_response["last"]["data"]["solutions"]["placementSolutions"] + } + if not os.path.exists(dirname): + os.makedirs(dirname) + f = open(file, 'w+') + f.write(json.dumps(result, indent=4)) + f.close() + return result + else: + message = osdf_response["last"]["data"]["statusMessage"] + raise Exception("OOF request {}: {}".format(status, message)) + else: + raise Exception("No response for OOF request") + + def _has_request(onap_ip, aai_data, exclude, use_oof_cache): dirname = os.path.join('templates/oof-cache/', aai_data['vf-module-id']) if exclude: @@ -278,15 +412,17 @@ def _has_request(onap_ip, aai_data, exclude, use_oof_cache): node['attributes']['model-invariant-id'] = aai_data['vfw-model-info']['model-invariant-id'] node['attributes']['model-version-id'] = aai_data['vfw-model-info']['model-version-id'] if exclude: - node['excluded_candidates'][0]['candidate_id'] = aai_data['vf-module-id'] + node['excluded_candidates'][0]['candidate_id'][0] = aai_data['vf-module-id'] del node['required_candidates'] else: - node['required_candidates'][0]['candidate_id'] = aai_data['vf-module-id'] + node['required_candidates'][0]['candidate_id'][0] = aai_data['vf-module-id'] del node['excluded_candidates'] node = template['template']['demands']['vPGN'][0] node['attributes']['model-invariant-id'] = aai_data['vpgn-model-info']['model-invariant-id'] node['attributes']['model-version-id'] = aai_data['vpgn-model-info']['model-version-id'] + #print(json.dumps(template, indent=4)) + with _no_ssl_verification(): response = api.has.plans(body=template, params={}, headers={}) if response.body.get('error_message') is not None: @@ -345,6 +481,39 @@ def _extract_has_appc_identifiers(has_result, demand): return config +def _extract_osdf_appc_identifiers(has_result, demand): + if demand == 'vPGN': + v_server = has_result[demand]['vservers'][0] + else: + if len(has_result[demand]['vservers'][0]['l-interfaces']) == 4: + v_server = has_result[demand]['vservers'][0] + else: + v_server = has_result[demand]['vservers'][1] + for itf in v_server['l-interfaces']: + if itf['ipv4-addresses'][0].startswith("10.0."): + ip = itf['ipv4-addresses'][0] + break + + if v_server['vserver-name'] in hostname_cache and demand != 'vPGN': + v_server['vserver-name'] = v_server['vserver-name'].replace("01", "02") + hostname_cache.append(v_server['vserver-name']) + + config = { + 'vnf-id': has_result[demand]['nf-id'], + 'vf-module-id': has_result[demand]['vf-module-id'], + 'ip': ip, + 'vserver-id': v_server['vserver-id'], + 'vserver-name': v_server['vserver-name'], + 'vnfc-type': demand.lower(), + 'physical-location-id': has_result[demand]['locationId'] + } + ansible_inventory_entry = "{} ansible_ssh_host={} ansible_ssh_user=ubuntu".format(config['vserver-name'], config['ip']) + if demand.lower() not in ansible_inventory: + ansible_inventory[demand.lower()] = {} + ansible_inventory[demand.lower()][config['vserver-name']] = ansible_inventory_entry + return config + + def _extract_has_appc_dt_config(has_result, demand): if demand == 'vPGN': return {} @@ -371,6 +540,13 @@ def _extract_has_appc_dt_config(has_result, demand): return config +def _extract_osdf_appc_dt_config(osdf_result, demand): + if demand == 'vPGN': + return {} + else: + return osdf_result[demand] + + def _build_config_from_has(has_result): v_pgn_result = _extract_has_appc_identifiers(has_result, 'vPGN') v_fw_result = _extract_has_appc_identifiers(has_result, 'vFW-SINK') @@ -387,6 +563,42 @@ def _build_config_from_has(has_result): return config +def _adapt_osdf_result(osdf_result): + result = {} + demand = _build_osdf_result_demand(osdf_result["solution"][0][0]) + result[demand["name"]] = demand["value"] + demand = _build_osdf_result_demand(osdf_result["solution"][0][1]) + result[demand["name"]] = demand["value"] + return result + + +def _build_osdf_result_demand(solution): + result = {} + result["name"] = solution["resourceModuleName"] + value = {"candidateId": solution["solution"]["identifiers"][0]} + for info in solution["assignmentInfo"]: + value[info["key"]] = info["value"] + result["value"] = value + return result + + +def _build_config_from_osdf(osdf_result): + osdf_result = _adapt_osdf_result(osdf_result) + v_pgn_result = _extract_osdf_appc_identifiers(osdf_result, 'vPGN') + v_fw_result = _extract_osdf_appc_identifiers(osdf_result, 'vFW-SINK') + dt_config = _extract_osdf_appc_dt_config(osdf_result, 'vFW-SINK') + + config = { + 'vPGN': v_pgn_result, + 'vFW-SINK': v_fw_result + } + #print(json.dumps(config, indent=4)) + config['dt-config'] = { + 'destinations': [dt_config] + } + return config + + def _build_appc_lcm_dt_payload(is_vpkg, oof_config, book_name, traffic_presence): is_check = traffic_presence is not None oof_config = copy.deepcopy(oof_config) @@ -469,16 +681,32 @@ def _set_appc_lcm_timestamp(body, timestamp=None): body['input']['common-header']['timestamp'] = timestamp -def build_appc_lcms_requests_body(onap_ip, aai_data, use_oof_cache, if_close_loop_vfw): - migrate_from = _has_request(onap_ip, aai_data, False, use_oof_cache) +def build_appc_lcms_requests_body(rancher_ip, onap_ip, aai_data, use_oof_cache, if_close_loop_vfw): + if_has = False - if if_close_loop_vfw: - migrate_to = migrate_from + if if_has: + migrate_from = _has_request(onap_ip, aai_data, False, use_oof_cache) + + if if_close_loop_vfw: + migrate_to = migrate_from + else: + migrate_to = _has_request(onap_ip, aai_data, True, use_oof_cache) + + migrate_from = _build_config_from_has(migrate_from) + migrate_to = _build_config_from_has(migrate_to) else: - migrate_to = _has_request(onap_ip, aai_data, True, use_oof_cache) + migrate_from = _osdf_request(rancher_ip, onap_ip, aai_data, False, use_oof_cache) + + if if_close_loop_vfw: + migrate_to = migrate_from + else: + migrate_to = _osdf_request(rancher_ip, onap_ip, aai_data, True, use_oof_cache) + + migrate_from = _build_config_from_osdf(migrate_from) + migrate_to = _build_config_from_osdf(migrate_to) - migrate_from = _build_config_from_has(migrate_from) - migrate_to = _build_config_from_has(migrate_to) + #print(json.dumps(migrate_from, indent=4)) + #print(json.dumps(migrate_to, indent=4)) req_id = str(uuid.uuid4()) payload_dt_check_vpkg = _build_appc_lcm_request_body(True, migrate_from, req_id, 'DistributeTrafficCheck', True) payload_dt_vpkg_to = _build_appc_lcm_request_body(True, migrate_to, req_id, 'DistributeTraffic') @@ -552,14 +780,17 @@ def confirm_appc_lcm_action(onap_ip, req, check_appc_result): return -def execute_workflow(vfw_vnf_id, onap_ip, use_oof_cache, if_close_loop_vfw, info_only, check_result): - print("\nExecuting workflow for VNF ID '{}' on ONAP with IP {}".format(vfw_vnf_id, onap_ip)) +def execute_workflow(vfw_vnf_id, rancher_ip, onap_ip, use_oof_cache, if_close_loop_vfw, info_only, check_result): + print("\nExecuting workflow for VNF ID '{}' on Rancher with IP {} and ONAP with IP {}".format( + vfw_vnf_id, rancher_ip, onap_ip)) print("\nOOF Cache {}, is CL vFW {}, only info {}, check LCM result {}".format(use_oof_cache, if_close_loop_vfw, info_only, check_result)) + x = threading.Thread(target=_run_osdf_resp_server, daemon=True) + x.start() aai_data = load_aai_data(vfw_vnf_id, onap_ip) print("\nvFWDT Service Information:") print(json.dumps(aai_data, indent=4)) - lcm_requests = build_appc_lcms_requests_body(onap_ip, aai_data, use_oof_cache, if_close_loop_vfw) + lcm_requests = build_appc_lcms_requests_body(rancher_ip, onap_ip, aai_data, use_oof_cache, if_close_loop_vfw) print("\nAnsible Inventory:") for key in ansible_inventory: print("[{}]".format(key)) @@ -579,6 +810,6 @@ def execute_workflow(vfw_vnf_id, onap_ip, use_oof_cache, if_close_loop_vfw, info #time.sleep(30) -#vnf_id, K8s node IP, use OOF cache, if close loop vfw, if info_only, if check APPC result -execute_workflow(sys.argv[1], sys.argv[2], sys.argv[3].lower() == 'true', sys.argv[4].lower() == 'true', - sys.argv[5].lower() == 'true', sys.argv[6].lower() == 'true') +#vnf_id, Rancher node IP, K8s node IP, use OOF cache, if close loop vfw, if info_only, if check APPC result +execute_workflow(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4].lower() == 'true', sys.argv[5].lower() == 'true', + sys.argv[6].lower() == 'true', sys.argv[7].lower() == 'true') |