From 369e51562f068d5e653211902efc69220508eca1 Mon Sep 17 00:00:00 2001 From: DR695H Date: Wed, 19 Jun 2019 21:16:58 -0400 Subject: move so, clamp, oof to jinja Issue-ID: TEST-158 Change-Id: I88798326879463103a66a97d4ddbc53e864be01a Signed-off-by: DR695H --- .../oof/optf-has/plan_with_wrong_version.json | 40 ++++++++ robot/assets/oof/optf-osdf/pci-opt-request.json | 20 ++++ robot/assets/oof/optf-osdf/placement_request.json | 102 +++++++++++++++++++++ robot/assets/templates/clamp/create_model.jinja | 1 + robot/assets/templates/clamp/create_model.template | 1 - robot/assets/templates/clamp/save_model_vlb.jinja | 1 + .../assets/templates/clamp/save_model_vlb.template | 1 - .../templates/cmso/OneVnfOneChangeWindow.jinja | 30 ++++++ .../cmso/OneVnfOneChangeWindow.json.template | 30 ------ robot/assets/templates/cmso/VidCallbackData.jinja | 36 ++++++++ .../templates/cmso/VidCallbackData.json.template | 36 -------- .../optf-has/plan_with_wrong_version.json | 40 -------- .../templates/optf-osdf/pci-opt-request.json | 20 ---- .../templates/optf-osdf/placement_request.json | 102 --------------------- robot/assets/templates/so/cloud_config_v3.jinja | 19 ++++ robot/assets/templates/so/cloud_config_v3.template | 19 ---- .../assets/templates/so/create_cloud_config.jinja | 17 ++++ .../templates/so/create_cloud_config.template | 17 ---- robot/resources/clamp_interface.robot | 11 ++- robot/resources/oof_interface.robot | 44 ++++----- robot/resources/so/create_cloud_config.robot | 15 +-- robot/resources/so_interface.robot | 1 - .../vnf_orchestration_with_cds_test_template.robot | 1 - 23 files changed, 304 insertions(+), 300 deletions(-) create mode 100644 robot/assets/oof/optf-has/plan_with_wrong_version.json create mode 100644 robot/assets/oof/optf-osdf/pci-opt-request.json create mode 100644 robot/assets/oof/optf-osdf/placement_request.json create mode 100644 robot/assets/templates/clamp/create_model.jinja delete mode 100644 robot/assets/templates/clamp/create_model.template create mode 100644 robot/assets/templates/clamp/save_model_vlb.jinja delete mode 100644 robot/assets/templates/clamp/save_model_vlb.template create mode 100644 robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja delete mode 100644 robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template create mode 100644 robot/assets/templates/cmso/VidCallbackData.jinja delete mode 100644 robot/assets/templates/cmso/VidCallbackData.json.template delete mode 100644 robot/assets/templates/optf-has/plan_with_wrong_version.json delete mode 100644 robot/assets/templates/optf-osdf/pci-opt-request.json delete mode 100644 robot/assets/templates/optf-osdf/placement_request.json create mode 100644 robot/assets/templates/so/cloud_config_v3.jinja delete mode 100644 robot/assets/templates/so/cloud_config_v3.template create mode 100644 robot/assets/templates/so/create_cloud_config.jinja delete mode 100644 robot/assets/templates/so/create_cloud_config.template (limited to 'robot') diff --git a/robot/assets/oof/optf-has/plan_with_wrong_version.json b/robot/assets/oof/optf-has/plan_with_wrong_version.json new file mode 100644 index 00000000..670bcb6d --- /dev/null +++ b/robot/assets/oof/optf-has/plan_with_wrong_version.json @@ -0,0 +1,40 @@ +{ + "name":"onap template with wrong version", + "template":{ + "homing_template_version":"xxxx-yy-zz", + "parameters":{ + "service_name":"Residential vCPE", + "service_id":"vcpe_service_id", + "customer_lat":45.395968, + "customer_long":-71.135344, + "physical_location":"DLLSTX233", + "REQUIRED_MEM":4, + "REQUIRED_DISK":100, + "pnf_id":"some_pnf_id" + }, + "locations":{ + "customer_loc":{ + "latitude":{ + "get_param":"customer_lat" + }, + "longitude":{ + "get_param":"customer_long" + } + } + }, + "demands":{ + "vG":[ + { + "inventory_provider":"aai", + "inventory_type":"cloud" + } + ] + }, + "constraints":{ + + }, + "optimization":{ + + } + } +} diff --git a/robot/assets/oof/optf-osdf/pci-opt-request.json b/robot/assets/oof/optf-osdf/pci-opt-request.json new file mode 100644 index 00000000..7ec9ab5f --- /dev/null +++ b/robot/assets/oof/optf-osdf/pci-opt-request.json @@ -0,0 +1,20 @@ +{ + "requestInfo": { + "transactionId": "xxx-xxx-xxxx", + "requestId": "yyy-yyy-yyyy", + "callbackUrl": "https://wiki.onap.org:5000/callbackUrl/", + "sourceId": "SO", + "requestType": "create", + "numSolutions": 1, + "optimizers": [ + "placement" + ], + "timeout": 600 + }, + "cellInfo": { + "networkId": "1000", + "cellIdList": [ + "cell0" + ] + } +} \ No newline at end of file diff --git a/robot/assets/oof/optf-osdf/placement_request.json b/robot/assets/oof/optf-osdf/placement_request.json new file mode 100644 index 00000000..d9b16ca5 --- /dev/null +++ b/robot/assets/oof/optf-osdf/placement_request.json @@ -0,0 +1,102 @@ +{ + "requestInfo": { + "transactionId": "xxx-xxx-xxxx", + "requestId": "yyy-yyy-yyyy", + "callbackUrl": "https://wiki.onap.org:5000/callbackUrl/", + "sourceId": "SO", + "requestType": "create", + "numSolutions": 1, + "optimizers": ["placement"], + "timeout": 600 + }, + "placementInfo": { + "requestParameters": { "customerLatitude": 32.89748, "customerLongitude": -97.040443, "customerName": "xyz" }, + "subscriberInfo": {"globalSubscriberId": "xxx-xx-xxx", "subscriberName": "subscriber_x"}, + "placementDemands": [ + { + "resourceModuleName": "vGMuxInfra", + "serviceResourceId": "vGMuxInfra-xx", + "tenantId": "vGMuxInfra-tenant", + "resourceModelInfo": { + "modelInvariantId": "vGMuxInfra-modelInvariantId", + "modelVersionId": "vGMuxInfra-versionId", + "modelName": "vGMuxInfra-model", + "modelType": "resource", + "modelVersion": "1.0", + "modelCustomizationName": "vGMuxInfra-customeModelName" + } + }, + { + "resourceModuleName": "vG", + "serviceResourceId": "71d563e8-e714-4393-8f99-cc480144a05e", + "tenantId": "vG-tenant", + "resourceModelInfo": { + "modelInvariantId": "vG-modelInvariantId", + "modelVersionId": "vG-versionId", + "modelName": "vG-model", + "modelType": "resource", + "modelVersion": "1.0", + "modelCustomizationName": "vG-customeModelName" + }, + "existingCandidates": [ + { + "identifierType": "serviceInstanceId", + "cloudOwner": "", + "identifiers": ["gjhd-098-fhd-987"] + } + ], + "excludedCandidates": [ + { + "identifierType": "serviceInstanceId", + "cloudOwner": "", + "identifiers": ["gjhd-098-fhd-987"] + }, + { + "identifierType": "vimId", + "cloudOwner": "vmware", + "identifiers": ["NYMDT67"] + } + ], + "requiredCandidates": [ + { + "identifierType": "vimId", + "cloudOwner": "amazon", + "identifiers": ["TXAUS219"] + } + ] + } + ] + }, + "serviceInfo": { + "serviceInstanceId": "d61b2543-5914-4b8f-8e81-81e38575b8ec", + "serviceName": "vCPE", + "modelInfo": { + "modelInvariantId": "vCPE-invariantId", + "modelVersionId": "vCPE-versionId", + "modelName": "vCPE-model", + "modelType": "service", + "modelVersion": "1.0", + "modelCustomizationName": "vCPE-customeModelName" + } + }, + "licenseInfo": { + "licenseDemands": [ + { + "resourceModuleName": "vGMuxInfra", + "serviceResourceId": "vGMuxInfra-xx", + "resourceModelInfo": { + "modelInvariantId": "vGMuxInfra-modelInvariantId", + "modelVersionId": "vGMuxInfra-versionId", + "modelName": "vGMuxInfra-model", + "modelType": "resource", + "modelVersion": "1.0", + "modelCustomizationName": "vGMuxInfra-customeModelName" + }, + "existingLicenses": { + "entitlementPoolUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"], + "licenseKeyGroupUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"] + } + } + ] + } +} \ No newline at end of file diff --git a/robot/assets/templates/clamp/create_model.jinja b/robot/assets/templates/clamp/create_model.jinja new file mode 100644 index 00000000..0e4bea89 --- /dev/null +++ b/robot/assets/templates/clamp/create_model.jinja @@ -0,0 +1 @@ +{"name":"{{MODEL_NAME}}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{}","imageText":"\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tV\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tE\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tS\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tVesCollector\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tTCA\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tPolicy\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n","templateName":"{{TEMPLATE_NAME}}"} diff --git a/robot/assets/templates/clamp/create_model.template b/robot/assets/templates/clamp/create_model.template deleted file mode 100644 index dfa628cd..00000000 --- a/robot/assets/templates/clamp/create_model.template +++ /dev/null @@ -1 +0,0 @@ -{"name":"${MODEL_NAME}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{}","imageText":"\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tV\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tE\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tS\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tVesCollector\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tTCA\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tPolicy\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n","templateName":"${TEMPLATE_NAME}"} diff --git a/robot/assets/templates/clamp/save_model_vlb.jinja b/robot/assets/templates/clamp/save_model_vlb.jinja new file mode 100644 index 00000000..a6a144ba --- /dev/null +++ b/robot/assets/templates/clamp/save_model_vlb.jinja @@ -0,0 +1 @@ +{"name":"{{MODEL_NAME}}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{\"Policy_12lup3h\":{\"{{POLICY_NAME}}\":[{\"name\":\"pname\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"YJ6lIO4\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"actor\",\"value\":[\"APPC\"]},{\"name\":\"recipePayload\",\"value\":[\"\"]},{\"name\":\"recipeLevel\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]},{\"name\":\"targetResourceIdOther\",\"value\":[\"\"]},{\"name\":\"guardPolicyType\",\"value\":[\"GUARD_MIN_MAX\"]},{\"name\":\"guardTargets\",\"value\":[\".*\"]},{\"name\":\"minGuard\",\"value\":[\"1\"]},{\"name\":\"maxGuard\",\"value\":[\"1\"]},{\"name\":\"limitGuard\",\"value\":[\"1\"]},{\"name\":\"timeUnitsGuard\",\"value\":[\"minute\"]},{\"name\":\"timeWindowGuard\",\"value\":[\"10\"]},{\"name\":\"guardActiveStart\",\"value\":[\"00:00:01-05:00\"]},{\"name\":\"guardActiveEnd\",\"value\":[\"23:59:59-05:00\"]}]]}]},\"TCA_1d13unw\":{\"New_Set\":[{\"name\":\"tname\",\"value\":\"New_Set\"},{\"name\":\"tuuid\",\"value\":\"6aae3b26-6c63-t4de-f072-c812fb90204b\"},{\"name\":\"tcaPol\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"eventName\",\"value\":\"vLoadBalancer\"},{\"name\":\"controlLoopSchemaType\",\"value\":\"VNF\"},{\"name\":\"tcaPolId\",\"value\":\"0\"},{\"serviceConfigurations\":[[\"{{DOLLAR_SIGN}}.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"GREATER\",\"200\",\"ONSET\"]]}]}}","imageText":"\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tV\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tE\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tS\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tVesCollector\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tTCA\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tPolicy\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n","templateName":"{{TEMPLATE_NAME}}","typeId":null,"deploymentId":null} diff --git a/robot/assets/templates/clamp/save_model_vlb.template b/robot/assets/templates/clamp/save_model_vlb.template deleted file mode 100644 index 945953a0..00000000 --- a/robot/assets/templates/clamp/save_model_vlb.template +++ /dev/null @@ -1 +0,0 @@ -{"name":"${MODEL_NAME}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{\"Policy_12lup3h\":{\"${POLICY_NAME}\":[{\"name\":\"pname\",\"value\":\"${POLICY_NAME}\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"YJ6lIO4\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"actor\",\"value\":[\"APPC\"]},{\"name\":\"recipePayload\",\"value\":[\"\"]},{\"name\":\"recipeLevel\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]},{\"name\":\"targetResourceIdOther\",\"value\":[\"\"]},{\"name\":\"guardPolicyType\",\"value\":[\"GUARD_MIN_MAX\"]},{\"name\":\"guardTargets\",\"value\":[\".*\"]},{\"name\":\"minGuard\",\"value\":[\"1\"]},{\"name\":\"maxGuard\",\"value\":[\"1\"]},{\"name\":\"limitGuard\",\"value\":[\"1\"]},{\"name\":\"timeUnitsGuard\",\"value\":[\"minute\"]},{\"name\":\"timeWindowGuard\",\"value\":[\"10\"]},{\"name\":\"guardActiveStart\",\"value\":[\"00:00:01-05:00\"]},{\"name\":\"guardActiveEnd\",\"value\":[\"23:59:59-05:00\"]}]]}]},\"TCA_1d13unw\":{\"New_Set\":[{\"name\":\"tname\",\"value\":\"New_Set\"},{\"name\":\"tuuid\",\"value\":\"6aae3b26-6c63-t4de-f072-c812fb90204b\"},{\"name\":\"tcaPol\",\"value\":\"${POLICY_NAME}\"},{\"name\":\"eventName\",\"value\":\"vLoadBalancer\"},{\"name\":\"controlLoopSchemaType\",\"value\":\"VNF\"},{\"name\":\"tcaPolId\",\"value\":\"0\"},{\"serviceConfigurations\":[[\"${DOLLAR_SIGN}.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"GREATER\",\"200\",\"ONSET\"]]}]}}","imageText":"\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tV\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tE\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tS\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tVesCollector\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tTCA\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\tPolicy\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n\t\t\n\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\n","templateName":"${TEMPLATE_NAME}","typeId":null,"deploymentId":null} diff --git a/robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja b/robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja new file mode 100644 index 00000000..691aaff9 --- /dev/null +++ b/robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja @@ -0,0 +1,30 @@ +{ + "domain" : "ChangeManagement", + "scheduleId" : "{{uuid}}", + "scheduleName" : "{{uuid}}", + "userId" : "{{userId}}", + "domainData" : [{ + "CallbackUrl" : "{{callbackUrl}}", + "CallbackData" : "{{callbackData}}", + "WorkflowName" : "{{workflow}}" + } + ], + "schedulingInfo" : { + "normalDurationInSeconds" : 3600, + "additionalDurationInSeconds" : 0, + "concurrencyLimit" : 10, + "policyId" : "AllDayEveryDay", + "vnfDetails" : [{ + "groupId" : "group", + "node" : [ + "{{node1}}" + ], + "changeWindow" : [{ + "startTime" : "{{start_time1}}", + "endTime" : "{{end_time1}}" + } + ] + } + ] + } +} diff --git a/robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template b/robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template deleted file mode 100644 index 158f5919..00000000 --- a/robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template +++ /dev/null @@ -1,30 +0,0 @@ -{ - "domain" : "ChangeManagement", - "scheduleId" : "${uuid}", - "scheduleName" : "${uuid}", - "userId" : "${userId}", - "domainData" : [{ - "CallbackUrl" : "${callbackUrl}", - "CallbackData" : "${callbackData}", - "WorkflowName" : "${workflow}" - } - ], - "schedulingInfo" : { - "normalDurationInSeconds" : 3600, - "additionalDurationInSeconds" : 0, - "concurrencyLimit" : 10, - "policyId" : "AllDayEveryDay", - "vnfDetails" : [{ - "groupId" : "group", - "node" : [ - "${node1}" - ], - "changeWindow" : [{ - "startTime" : "${start_time1}", - "endTime" : "${end_time1}" - } - ] - } - ] - } -} diff --git a/robot/assets/templates/cmso/VidCallbackData.jinja b/robot/assets/templates/cmso/VidCallbackData.jinja new file mode 100644 index 00000000..c4c53167 --- /dev/null +++ b/robot/assets/templates/cmso/VidCallbackData.jinja @@ -0,0 +1,36 @@ +{ + "vnfName" : "{{vnfName}}", + "vnfInstanceId" : "dummy-vnfinstance-id", + "modelInfo" : { + "modelType" : "vnf", + "modelInvariantId" : "dummy-id", + "modelVersionId" : "dummy-id", + "modelName" : "dummy", + "modelCustomizationId" : "dummy-id" + }, + "cloudConfiguration" : { + "lcpCloudRegionId" : "dummy", + "tenantId" : "dummy-id" + }, + "requestInfo" : { + "source" : "VID", + "suppressRollback" : false, + "requestorId" : "az2016" + }, + "relatedInstanceList" : [{ + "relatedInstance" : { + "instanceId" : "dummy-id", + "modelInfo" : { + "modelType" : "service", + "modelInvariantId" : "dummy-id", + "modelVersionId" : "dummy-id", + "modelName" : "dummy-id", + "modelVersion" : "4.0" + } + } + } + ], + "requestParameters" : { + "usePreload" : true + } +} diff --git a/robot/assets/templates/cmso/VidCallbackData.json.template b/robot/assets/templates/cmso/VidCallbackData.json.template deleted file mode 100644 index 9abf9b9b..00000000 --- a/robot/assets/templates/cmso/VidCallbackData.json.template +++ /dev/null @@ -1,36 +0,0 @@ -{ - "vnfName" : "${vnfName}", - "vnfInstanceId" : "dummy-vnfinstance-id", - "modelInfo" : { - "modelType" : "vnf", - "modelInvariantId" : "dummy-id", - "modelVersionId" : "dummy-id", - "modelName" : "dummy", - "modelCustomizationId" : "dummy-id" - }, - "cloudConfiguration" : { - "lcpCloudRegionId" : "dummy", - "tenantId" : "dummy-id" - }, - "requestInfo" : { - "source" : "VID", - "suppressRollback" : false, - "requestorId" : "az2016" - }, - "relatedInstanceList" : [{ - "relatedInstance" : { - "instanceId" : "dummy-id", - "modelInfo" : { - "modelType" : "service", - "modelInvariantId" : "dummy-id", - "modelVersionId" : "dummy-id", - "modelName" : "dummy-id", - "modelVersion" : "4.0" - } - } - } - ], - "requestParameters" : { - "usePreload" : true - } -} diff --git a/robot/assets/templates/optf-has/plan_with_wrong_version.json b/robot/assets/templates/optf-has/plan_with_wrong_version.json deleted file mode 100644 index 670bcb6d..00000000 --- a/robot/assets/templates/optf-has/plan_with_wrong_version.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name":"onap template with wrong version", - "template":{ - "homing_template_version":"xxxx-yy-zz", - "parameters":{ - "service_name":"Residential vCPE", - "service_id":"vcpe_service_id", - "customer_lat":45.395968, - "customer_long":-71.135344, - "physical_location":"DLLSTX233", - "REQUIRED_MEM":4, - "REQUIRED_DISK":100, - "pnf_id":"some_pnf_id" - }, - "locations":{ - "customer_loc":{ - "latitude":{ - "get_param":"customer_lat" - }, - "longitude":{ - "get_param":"customer_long" - } - } - }, - "demands":{ - "vG":[ - { - "inventory_provider":"aai", - "inventory_type":"cloud" - } - ] - }, - "constraints":{ - - }, - "optimization":{ - - } - } -} diff --git a/robot/assets/templates/optf-osdf/pci-opt-request.json b/robot/assets/templates/optf-osdf/pci-opt-request.json deleted file mode 100644 index 7ec9ab5f..00000000 --- a/robot/assets/templates/optf-osdf/pci-opt-request.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "requestInfo": { - "transactionId": "xxx-xxx-xxxx", - "requestId": "yyy-yyy-yyyy", - "callbackUrl": "https://wiki.onap.org:5000/callbackUrl/", - "sourceId": "SO", - "requestType": "create", - "numSolutions": 1, - "optimizers": [ - "placement" - ], - "timeout": 600 - }, - "cellInfo": { - "networkId": "1000", - "cellIdList": [ - "cell0" - ] - } -} \ No newline at end of file diff --git a/robot/assets/templates/optf-osdf/placement_request.json b/robot/assets/templates/optf-osdf/placement_request.json deleted file mode 100644 index d9b16ca5..00000000 --- a/robot/assets/templates/optf-osdf/placement_request.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "requestInfo": { - "transactionId": "xxx-xxx-xxxx", - "requestId": "yyy-yyy-yyyy", - "callbackUrl": "https://wiki.onap.org:5000/callbackUrl/", - "sourceId": "SO", - "requestType": "create", - "numSolutions": 1, - "optimizers": ["placement"], - "timeout": 600 - }, - "placementInfo": { - "requestParameters": { "customerLatitude": 32.89748, "customerLongitude": -97.040443, "customerName": "xyz" }, - "subscriberInfo": {"globalSubscriberId": "xxx-xx-xxx", "subscriberName": "subscriber_x"}, - "placementDemands": [ - { - "resourceModuleName": "vGMuxInfra", - "serviceResourceId": "vGMuxInfra-xx", - "tenantId": "vGMuxInfra-tenant", - "resourceModelInfo": { - "modelInvariantId": "vGMuxInfra-modelInvariantId", - "modelVersionId": "vGMuxInfra-versionId", - "modelName": "vGMuxInfra-model", - "modelType": "resource", - "modelVersion": "1.0", - "modelCustomizationName": "vGMuxInfra-customeModelName" - } - }, - { - "resourceModuleName": "vG", - "serviceResourceId": "71d563e8-e714-4393-8f99-cc480144a05e", - "tenantId": "vG-tenant", - "resourceModelInfo": { - "modelInvariantId": "vG-modelInvariantId", - "modelVersionId": "vG-versionId", - "modelName": "vG-model", - "modelType": "resource", - "modelVersion": "1.0", - "modelCustomizationName": "vG-customeModelName" - }, - "existingCandidates": [ - { - "identifierType": "serviceInstanceId", - "cloudOwner": "", - "identifiers": ["gjhd-098-fhd-987"] - } - ], - "excludedCandidates": [ - { - "identifierType": "serviceInstanceId", - "cloudOwner": "", - "identifiers": ["gjhd-098-fhd-987"] - }, - { - "identifierType": "vimId", - "cloudOwner": "vmware", - "identifiers": ["NYMDT67"] - } - ], - "requiredCandidates": [ - { - "identifierType": "vimId", - "cloudOwner": "amazon", - "identifiers": ["TXAUS219"] - } - ] - } - ] - }, - "serviceInfo": { - "serviceInstanceId": "d61b2543-5914-4b8f-8e81-81e38575b8ec", - "serviceName": "vCPE", - "modelInfo": { - "modelInvariantId": "vCPE-invariantId", - "modelVersionId": "vCPE-versionId", - "modelName": "vCPE-model", - "modelType": "service", - "modelVersion": "1.0", - "modelCustomizationName": "vCPE-customeModelName" - } - }, - "licenseInfo": { - "licenseDemands": [ - { - "resourceModuleName": "vGMuxInfra", - "serviceResourceId": "vGMuxInfra-xx", - "resourceModelInfo": { - "modelInvariantId": "vGMuxInfra-modelInvariantId", - "modelVersionId": "vGMuxInfra-versionId", - "modelName": "vGMuxInfra-model", - "modelType": "resource", - "modelVersion": "1.0", - "modelCustomizationName": "vGMuxInfra-customeModelName" - }, - "existingLicenses": { - "entitlementPoolUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"], - "licenseKeyGroupUUID": ["87257b49-9602-4ca1-9817-094e52bc873b", "43257b49-9602-4fe5-9337-094e52bc9435"] - } - } - ] - } -} \ No newline at end of file diff --git a/robot/assets/templates/so/cloud_config_v3.jinja b/robot/assets/templates/so/cloud_config_v3.jinja new file mode 100644 index 00000000..6d445e56 --- /dev/null +++ b/robot/assets/templates/so/cloud_config_v3.jinja @@ -0,0 +1,19 @@ +{ + "id": "{{site_name}}", + "region_id": "{{region_id}}", + "aic_version": "2.5", + "clli": "{{clli}}", + "identityService": { + "identity_url": "{{identity_url}}", + "mso_id": "{{mso_id}}", + "mso_pass": "{{mso_pass}}", + "admin_tenant": "{{admin_tenant}}", + "member_role": "{{member_role}}", + "tenant_meta_data": true, + "id": "{{identity_id}}", + "identity_server_type": "{{identity_server_type}}", + "identity_authentication_type": "{{authentication_type}}", + "project_domain_name": "{{project_domain_name}}", + "user_domain_name": "{{user_domain_name}}" + } +} diff --git a/robot/assets/templates/so/cloud_config_v3.template b/robot/assets/templates/so/cloud_config_v3.template deleted file mode 100644 index 61674589..00000000 --- a/robot/assets/templates/so/cloud_config_v3.template +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "${site_name}", - "region_id": "${region_id}", - "aic_version": "2.5", - "clli": "${clli}", - "identityService": { - "identity_url": "${identity_url}", - "mso_id": "${mso_id}", - "mso_pass": "${mso_pass}", - "admin_tenant": "${admin_tenant}", - "member_role": "${member_role}", - "tenant_meta_data": true, - "id": "${identity_id}", - "identity_server_type": "${identity_server_type}", - "identity_authentication_type": "${authentication_type}", - "project_domain_name": "${project_domain_name}", - "user_domain_name": "${user_domain_name}" - } -} diff --git a/robot/assets/templates/so/create_cloud_config.jinja b/robot/assets/templates/so/create_cloud_config.jinja new file mode 100644 index 00000000..aeb6a826 --- /dev/null +++ b/robot/assets/templates/so/create_cloud_config.jinja @@ -0,0 +1,17 @@ +{ + "id": "{{site_name}}", + "region_id": "{{region_id}}", + "aic_version": "2.5", + "clli": "{{clli}}", + "identityService": { + "identity_url": "{{identity_url}}", + "mso_id": "{{mso_id}}", + "mso_pass": "{{mso_pass}}", + "admin_tenant": "{{admin_tenant}}", + "member_role": "{{member_role}}", + "tenant_meta_data": true, + "id": "{{identity_id}}", + "identity_server_type": "{{identity_server_type}}", + "identity_authentication_type": "{{authentication_type}}" + } +} diff --git a/robot/assets/templates/so/create_cloud_config.template b/robot/assets/templates/so/create_cloud_config.template deleted file mode 100644 index 969a8b05..00000000 --- a/robot/assets/templates/so/create_cloud_config.template +++ /dev/null @@ -1,17 +0,0 @@ -{ - "id": "${site_name}", - "region_id": "${region_id}", - "aic_version": "2.5", - "clli": "${clli}", - "identityService": { - "identity_url": "${identity_url}", - "mso_id": "${mso_id}", - "mso_pass": "${mso_pass}", - "admin_tenant": "${admin_tenant}", - "member_role": "${member_role}", - "tenant_meta_data": true, - "id": "${identity_id}", - "identity_server_type": "${identity_server_type}", - "identity_authentication_type": "${authentication_type}" - } -} diff --git a/robot/resources/clamp_interface.robot b/robot/resources/clamp_interface.robot index b8ec12bf..a83bc4d3 100644 --- a/robot/resources/clamp_interface.robot +++ b/robot/resources/clamp_interface.robot @@ -4,9 +4,8 @@ Library RequestsLibrary Library Collections Library String Library ONAPLibrary.JSON - +Library ONAPLibrary.Templating Resource global_properties.robot -Resource json_templater.robot *** Variables *** ${CLAMP_HEALTH_CHECK_PATH} /restservices/clds/v1/healthcheck @@ -15,7 +14,7 @@ ${CLAMP_BASE_PATH} /restservices/clds/v1 ${CLAMP_CLIENT_KEY} robot/assets/keys/org.onap.clamp.key.clear.pem ${CLAMP_CLIENT_CERT} robot/assets/keys/org.onap.clamp.cert.pem -${CLAMP_TEMPLATE_PATH} robot/assets/templates/clamp +${CLAMP_TEMPLATE_PATH} clamp *** Keywords *** @@ -23,7 +22,8 @@ Run CLAMP Create Model [Documentation] Create a new CLAMP Model [Arguments] ${model_name} ${template_name} ${dict}= Create Dictionary MODEL_NAME=${model_name} TEMPLATE_NAME=${template_name} - ${data}= Fill JSON Template File ${CLAMP_TEMPLATE_PATH}/create_model.template ${dict} + Create Environment clamp ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Apply Template clamp ${CLAMP_TEMPLATE_PATH}/create_model.jinja ${dict} ${data_path}= Set Variable ${CLAMP_BASE_PATH}/clds/model/${model_name} ${resp}= Run CLAMP HTTPS Put Request ${data_path} ${data} Should Be Equal As Strings ${resp.status_code} 200 @@ -35,7 +35,8 @@ Run CLAMP Save vLB Model [Documentation] Save CLAMP Model [Arguments] ${model_name} ${template_name} ${policy_name} ${dict}= Create Dictionary MODEL_NAME=${model_name} TEMPLATE_NAME=${template_name} POLICY_NAME=${policy_name} DOLLAR_SIGN=$ - ${data}= Fill JSON Template File ${CLAMP_TEMPLATE_PATH}/save_model_vlb.template ${dict} + Create Environment clamp ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Apply Template clamp ${CLAMP_TEMPLATE_PATH}/save_model_vlb.jinja ${dict} ${data_path}= Set Variable ${CLAMP_BASE_PATH}/clds/model/${model_name} ${resp}= Run CLAMP HTTPS Put Request ${data_path} ${data} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot index ad002f4b..eaf91b28 100644 --- a/robot/resources/oof_interface.robot +++ b/robot/resources/oof_interface.robot @@ -7,46 +7,47 @@ Library String Library DateTime Library Collections Library ONAPLibrary.JSON +Library ONAPLibrary.Templating Resource global_properties.robot -Resource json_templater.robot *** Variables *** ${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck ${OOF_SNIRO_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck ${OOF_CMSO_HEALTH_CHECK_PATH} /cmso/v1/health?checkInterfaces=true -${OOF_CMSO_TEMPLATE_FOLDER} robot/assets/templates/cmso +${OOF_CMSO_TEMPLATE_FOLDER} cmso ${OOF_CMSO_UTC} %Y-%m-%dT%H:%M:%SZ -${OOF_HOMING_PLAN_FOLDER} robot/assets/templates/optf-has -${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/templates/optf-osdf +${OOF_HOMING_PLAN_FOLDER} robot/assets/oof/optf-has +${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/oof/optf-osdf ${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} ${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT} ${OOF_CMSO_ENDPOINT} ${GLOBAL_OOF_CMSO_PROTOCOL}://${GLOBAL_INJECTED_OOF_CMSO_IP_ADDR}:${GLOBAL_OOF_CMSO_SERVER_PORT} ${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} -${OOF_HOMING_AUTH} Basic YWRtaW4xOnBsYW4uMTU= *** Keywords *** Run OOF-Homing Health Check - [Documentation] Runs OOF-Homing Health check - ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH} - Should Be Equal As Integers ${resp.status_code} 200 + [Documentation] Runs OOF-Homing Health check + ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH} + Should Be Equal As Integers ${resp.status_code} 200 Run OOF-Homing Get Request - [Documentation] Runs OOF-Homing Get request - [Arguments] ${data_path} - ${session}= Create Session session ${OOF_HOMING_ENDPOINT} - ${resp}= Get Request session ${data_path} - Should Be Equal As Integers ${resp.status_code} 200 - Log Received response from OOF-Homing ${resp.text} - [Return] ${resp} + [Documentation] Runs OOF-Homing Get request + [Arguments] ${data_path} + ${session}= Create Session session ${OOF_HOMING_ENDPOINT} + ${resp}= Get Request session ${data_path} + Should Be Equal As Integers ${resp.status_code} 200 + Log Received response from OOF-Homing ${resp.text} + [Return] ${resp} RUN OOF-Homing SendPlanWithWrongVersion - [Documentation] It sends a POST request to conductor + [Documentation] It sends a POST request to conductor ${session}= Create Session optf-cond ${OOF_HOMING_ENDPOINT} ${data}= Get Binary File ${OOF_HOMING_PLAN_FOLDER}${/}plan_with_wrong_version.json - &{headers}= Create Dictionary Authorization=${OOF_HOMING_Auth} Content-Type=application/json Accept=application/json + ${auth}= Create List ${GLOBAL_OOF_HOMING_USERNAME} ${GLOBAL_OOF_HOMING_PASSWORD} + ${session}= Create Session session ${OOF_CMSO_ENDPOINT} auth=${auth} + &{headers}= Create Dictionary Content-Type=application/json Accept=application/json ${resp}= Post Request optf-cond /v1/plans data=${data} headers=${headers} Log ********************* Log response = ${resp} @@ -99,7 +100,7 @@ Run OOF-CMSO Post Scheduler Run OOF-CMSO Future Schedule [Documentation] Runs CMSO Future Schedule ETE test. One VNF, One Change Window - [Arguments] ${request_file}=OneVnfOneChangeWindow.json.template ${workflow}=Replace ${minutesFromNow}=3 + [Arguments] ${request_file}=OneVnfOneChangeWindow.jinja ${workflow}=Replace ${minutesFromNow}=3 ${uuid}= Generate UUID4 ${resp}= OOF-CMSO Create Schedule ${uuid} ${request_file} workflow=${workflow} minutesFromNow=${minutesFromNow} Should Be Equal as Strings ${resp.status_code} 202 @@ -126,16 +127,17 @@ OOF-CMSO Create Schedule \ ${end_time}= Get Current Date UTC + ${tomorrow} minutes result_format=${OOF_CMSO_UTC} \ Set To Dictionary ${map} start_time${i}=${start_time} end_time${i}=${end_time} ${requestList}= Create List + Create Environment oof ${GLOBAL_TEMPLATE_FOLDER} :FOR ${vnf} IN @{nodelist} \ Set To Dictionary ${map} node${nn} ${vnf} \ ${nn}= Evaluate ${nn}+1 - \ Set To DIctionary ${dict} vnfName=${vnf} - \ ${requestInfo}= Fill JSON Template File ${OOF_CMSO_TEMPLATE_FOLDER}/VidCallbackData.json.template ${dict} + \ Set To DIctionary ${dict} vnfName=${vnf} + \ ${requestInfo}= Apply Template oof ${OOF_CMSO_TEMPLATE_FOLDER}/VidCallbackData.jinja ${dict} \ Append To List ${requestList} ${requestInfo} ${callBackDataMap}= Create Dictionary requestType=Update requestDetails=${requestList} ${callbackDataString}= OOF-CMSO Json Escape ${callbackDataMap} Set To Dictionary ${map} callbackData=${callbackDataString} - ${data}= Fill JSON Template File ${OOF_CMSO_TEMPLATE_FOLDER}/${request_file} ${map} + ${data}= Apply Template oof ${OOF_CMSO_TEMPLATE_FOLDER}/${request_file} ${map} ${resp}= Run OOF-CMSO Post Scheduler cmso/v1/schedules/${uuid} data=${data} [Return] ${resp} diff --git a/robot/resources/so/create_cloud_config.robot b/robot/resources/so/create_cloud_config.robot index 8762d415..9c310fd0 100644 --- a/robot/resources/so/create_cloud_config.robot +++ b/robot/resources/so/create_cloud_config.robot @@ -1,25 +1,26 @@ *** Settings *** Documentation Create Cloud Config -Resource ../json_templater.robot Resource ../so_interface.robot Library OperatingSystem Library Collections +Library ONAPLibrary.Templating *** Variables *** ${CLOUD_CONFIG_PATH} /cloudSite ${SYSTEM USER} robot-ete -${SO_ADD_CLOUD_CONFIG}= robot/assets/templates/so/create_cloud_config.template -${SO_ADD_CLOUD_CONFIG_V3}= robot/assets/templates/so/cloud_config_v3.template +${SO_ADD_CLOUD_CONFIG}= so/create_cloud_config.jinja +${SO_ADD_CLOUD_CONFIG_V3}= so/cloud_config_v3.jinja *** Keywords *** Create Cloud Configuration [Documentation] Creates a cloud configuration in SO, so it knows how to talk to an openstack cloud [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type} - ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG} ${arguments} + Create Environment so ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Apply Template so ${SO_ADD_CLOUD_CONFIG} ${arguments} ${get_resp}= Run SO Catalog Post request ${CLOUD_CONFIG_PATH}/${site_name} ${data} ${get_resp}= Run Keyword If '${get_resp.status_code}'=='404' Update Cloud Configuration ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} @@ -31,7 +32,8 @@ Create Cloud Configuration v3 [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${project_domain_name} ${user_domain_Name} ${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type} project_domain_name=${project_domain_name} user_domain_name=${user_domain_name} Log ${arguments} - ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG_V3} ${arguments} + Create Environment so ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Apply Template so ${SO_ADD_CLOUD_CONFIG_V3} ${arguments} ${get_resp}= Run SO Catalog Post request ${CLOUD_CONFIG_PATH} ${data} ${status_string}= Convert To String ${get_resp.status_code} Should Match Regexp ${status_string} ^(201|200)$ @@ -40,7 +42,8 @@ Update Cloud Configuration [Documentation] Updates a cloud configuration in SO [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type} - ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG} ${arguments} + Create Environment so ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Apply Template so ${SO_ADD_CLOUD_CONFIG} ${arguments} ${get_resp}= Run SO Catalog Put request ${CLOUD_CONFIG_PATH}/${site_name} ${data} Should Be Equal As Strings ${get_resp.status_code} 200 [Return] ${get_resp} diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot index 6c4fd26e..1e555dbf 100644 --- a/robot/resources/so_interface.robot +++ b/robot/resources/so_interface.robot @@ -5,7 +5,6 @@ Library ONAPLibrary.Utilities Library OperatingSystem Library Collections Resource global_properties.robot -Resource ../resources/json_templater.robot *** Variables *** ${MSO_HEALTH_CHECK_PATH} /manage/health ${MSO_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SERVER_PORT} diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot index e5ffc97e..f11715e3 100644 --- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot @@ -18,7 +18,6 @@ Resource ../openstack/neutron_interface.robot Resource ../heatbridge.robot Resource ../global_properties.robot -Resource ../json_templater.robot Resource ../so_interface.robot Library ONAPLibrary.Openstack -- cgit 1.2.3-korg