diff options
| author |   mrichomme <morgan.richomme@orange.com> | 2020-03-09 15:26:13 +0100 |
|---|---|---|
| committer | mrichomme <morgan.richomme@orange.com> | 2020-03-18 09:18:01 +0100 |
| commit | 4f144a79e622058f233446b70ba3370f31118582 (patch) | |
| tree | 6da8b728f5503d98c456f31515c69562133dca15 | |
| parent | 08f66656f78ebf1ae6dc2ed1419501b32c3701db (diff) | |
Fix json format issues
Issue-ID: INT-1478
Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: Ia5cb9866e7f6a7af45a361ba1d7c1722220054c3
Signed-off-by: mrichomme <morgan.richomme@orange.com>
14 files changed, 930 insertions, 915 deletions
diff --git a/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json b/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json index 137cb7a6..cc5b6b72 100644 --- a/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json +++ b/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json @@ -1,46 +1,46 @@ { - "reference_data": [ - { - "action": "ConfigScaleOut", - "action-level": "vnf", - "scope": { - "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", - "vnfc-type": "" - }, - "template": "Y", - "vm": [], - "device-protocol": "NETCONF-XML", - "user-name": "admin", - "port-number": "2831", - "artifact-list": [ - { - "artifact-name": "template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml", - "artifact-type": "config_template" - }, - { - "artifact-name": "pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml", - "artifact-type": "parameter_definitions" - } - ], - "template-id-list": [ - "vLB" - ], - "template-id": "vLB", - "scopeType": "vnf-type" - }, - { - "action": "AllAction", - "action-level": "vnf", - "scope": { - "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", - "vnfc-type": "" - }, - "artifact-list": [ - { - "artifact-name": "reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json", - "artifact-type": "reference_template" - } - ] - } - ] -}
\ No newline at end of file + "reference_data": [ + { + "action": "ConfigScaleOut", + "action-level": "vnf", + "scope": { + "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", + "vnfc-type": "" + }, + "template": "Y", + "vm": [], + "device-protocol": "NETCONF-XML", + "user-name": "admin", + "port-number": "2831", + "artifact-list": [ + { + "artifact-name": "template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml", + "artifact-type": "config_template" + }, + { + "artifact-name": "pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml", + "artifact-type": "parameter_definitions" + } + ], + "template-id-list": [ + "vLB" + ], + "template-id": "vLB", + "scopeType": "vnf-type" + }, + { + "action": "AllAction", + "action-level": "vnf", + "scope": { + "vnf-type": "vLoadBalancer/vLoadBalancer-test 0", + "vnfc-type": "" + }, + "artifact-list": [ + { + "artifact-name": "reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json", + "artifact-type": "reference_template" + } + ] + } + ] +} diff --git a/robot/assets/dcae/dcae_healthcheck.json b/robot/assets/dcae/dcae_healthcheck.json index d612b082..8a12b932 100644 --- a/robot/assets/dcae/dcae_healthcheck.json +++ b/robot/assets/dcae/dcae_healthcheck.json @@ -1,5 +1,5 @@ { - "path": "/reports/dcae/service-instances", - "start": "-24hour", - "end": "now" -}
\ No newline at end of file + "path": "/reports/dcae/service-instances", + "start": "-24hour", + "end": "now" +} diff --git a/robot/assets/oof/optf-has/plan_with_wrong_version.json b/robot/assets/oof/optf-has/plan_with_wrong_version.json index 670bcb6d..ec73beeb 100644 --- a/robot/assets/oof/optf-has/plan_with_wrong_version.json +++ b/robot/assets/oof/optf-has/plan_with_wrong_version.json @@ -1,40 +1,36 @@ { - "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":{ - + "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 index 7ec9ab5f..abbae323 100644 --- a/robot/assets/oof/optf-osdf/pci-opt-request.json +++ b/robot/assets/oof/optf-osdf/pci-opt-request.json @@ -17,4 +17,4 @@ "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 index d9b16ca5..45df8190 100644 --- a/robot/assets/oof/optf-osdf/placement_request.json +++ b/robot/assets/oof/optf-osdf/placement_request.json @@ -6,65 +6,82 @@ "sourceId": "SO", "requestType": "create", "numSolutions": 1, - "optimizers": ["placement"], + "optimizers": [ + "placement" + ], "timeout": 600 }, "placementInfo": { - "requestParameters": { "customerLatitude": 32.89748, "customerLongitude": -97.040443, "customerName": "xyz" }, - "subscriberInfo": {"globalSubscriberId": "xxx-xx-xxx", "subscriberName": "subscriber_x"}, + "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": "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" }, - { - "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"] - } + "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": { @@ -80,23 +97,29 @@ } }, "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"] - } + "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/security/ExpectedNodePorts.json b/robot/assets/security/ExpectedNodePorts.json index cb72af1a..8b719ce4 100644 --- a/robot/assets/security/ExpectedNodePorts.json +++ b/robot/assets/security/ExpectedNodePorts.json @@ -1,101 +1,101 @@ { - "30200": "vid", - "30201": "sdnc-portal", - "30202": "sdnc-8282", - "30203": "dgbuilder", - "30204": "sdc-be", - "30205": "sdc-be", - "30206": "sdc-fe", - "30207": "sdc-fe", - "30208": "sdnc-8202", - "30209": "httpd", - "30210": "aai-modelloader", - "30211": "appc-9090", - "30212": "portal-sdk", - "30213": "portal-app", - "30214": "portal-app3", - "30215": "portal-app", - "30218": "pap-9091", - "30219": "pap-8443", - "30220": "aai-sparky-be", - "30222": "xport-t-6061", - "30224": "so-monitor-port", - "30225": "portal-app4", - "30226": "message-router-3905", - "30227": "message-router-3904", - "30228": "dgbuilder", - "30229": "aai-modelloader-ssl", - "30230": "appc-8282", - "30231": "appc-1830", - "30233": "aai-ssl", - "30234": "pomba-kibana", - "30235": "xport-t-8080", - "30238": "vid-http", - "30239": "spike", - "30241": "dmaap-bc", - "30242": "dmaap-bc2", - "30246": "sdnc-8280", - "30248": "oof-has-api", - "30249": "pomba-data-router", - "30253": "log-kibana", - "30254": "log-es", - "30255": "log-ls", - "30256": "sdc-wfd-fe", - "30257": "sdc-wfd-be", - "30258": "clamp", - "30259": "dmaap-dr-prov", - "30260": "cli8080", - "30263": "dcae-fe", - "30264": "dcae-fe2", - "30265": "dcae-dt", - "30266": "dcae-dt2", - "30267": "sdnc-8443", - "30268": "aai-crud-service", - "30269": "dmaap-dr-prov2", - "30270": "consul-ui", - "30271": "cli9090", - "30274": "api-8080", - "30275": "oof-has-api", - "30277": "so-apih-port", - "30278": "aai-champ", - "30279": "babel", - "30280": "http-msb-iag", - "30281": "http-msb-discovery", - "30282": "http-msb-eag", - "30283": "https-msb-iag", - "30284": "https-msb-eag", - "30285": "http-msb-consul", - "30286": "client", - "30287": "gossip", - "30289": "appc-cdt", - "30290": "cdash-kibana", - "30297": "refrepo", - "30299": "https", - "30398": "uui", - "30399": "uui-server", - "30406": "so-vnfm-port", - "30415": "config-binding-service", - "30417": "xport-t-8443", - "30418": "xport-t-8080", - "30419": "xport-t-8443", - "30420": "api-8080", - "30431": "sdc-wfd-fe2", - "30470": "xport-u-6162", - "30476": "tomcat", - "30490": "message-router-kafka-0", - "30491": "message-router-kafka-1", - "30492": "message-router-kafka-1", - "30493": "dmaap-dr-node", - "30494": "dmaap-dr-node", - "30497": "cds-ui-3000", - "30499": "blueprints-processor-http", - "31110": "aaf-service", - "31111": "aaf-locate", - "31112": "aaf-oauth", - "31113": "aaf-hello", - "31114": "aaf-cm", - "31115": "aaf-hello", - "31116": "aaf-hello", - "31907": "dmaap-dr-prov2", - "32010": "xport-t-11011" + "30200": "vid", + "30201": "sdnc-portal", + "30202": "sdnc-8282", + "30203": "dgbuilder", + "30204": "sdc-be", + "30205": "sdc-be", + "30206": "sdc-fe", + "30207": "sdc-fe", + "30208": "sdnc-8202", + "30209": "httpd", + "30210": "aai-modelloader", + "30211": "appc-9090", + "30212": "portal-sdk", + "30213": "portal-app", + "30214": "portal-app3", + "30215": "portal-app", + "30218": "pap-9091", + "30219": "pap-8443", + "30220": "aai-sparky-be", + "30222": "xport-t-6061", + "30224": "so-monitor-port", + "30225": "portal-app4", + "30226": "message-router-3905", + "30227": "message-router-3904", + "30228": "dgbuilder", + "30229": "aai-modelloader-ssl", + "30230": "appc-8282", + "30231": "appc-1830", + "30233": "aai-ssl", + "30234": "pomba-kibana", + "30235": "xport-t-8080", + "30238": "vid-http", + "30239": "spike", + "30241": "dmaap-bc", + "30242": "dmaap-bc2", + "30246": "sdnc-8280", + "30248": "oof-has-api", + "30249": "pomba-data-router", + "30253": "log-kibana", + "30254": "log-es", + "30255": "log-ls", + "30256": "sdc-wfd-fe", + "30257": "sdc-wfd-be", + "30258": "clamp", + "30259": "dmaap-dr-prov", + "30260": "cli8080", + "30263": "dcae-fe", + "30264": "dcae-fe2", + "30265": "dcae-dt", + "30266": "dcae-dt2", + "30267": "sdnc-8443", + "30268": "aai-crud-service", + "30269": "dmaap-dr-prov2", + "30270": "consul-ui", + "30271": "cli9090", + "30274": "api-8080", + "30275": "oof-has-api", + "30277": "so-apih-port", + "30278": "aai-champ", + "30279": "babel", + "30280": "http-msb-iag", + "30281": "http-msb-discovery", + "30282": "http-msb-eag", + "30283": "https-msb-iag", + "30284": "https-msb-eag", + "30285": "http-msb-consul", + "30286": "client", + "30287": "gossip", + "30289": "appc-cdt", + "30290": "cdash-kibana", + "30297": "refrepo", + "30299": "https", + "30398": "uui", + "30399": "uui-server", + "30406": "so-vnfm-port", + "30415": "config-binding-service", + "30417": "xport-t-8443", + "30418": "xport-t-8080", + "30419": "xport-t-8443", + "30420": "api-8080", + "30431": "sdc-wfd-fe2", + "30470": "xport-u-6162", + "30476": "tomcat", + "30490": "message-router-kafka-0", + "30491": "message-router-kafka-1", + "30492": "message-router-kafka-1", + "30493": "dmaap-dr-node", + "30494": "dmaap-dr-node", + "30497": "cds-ui-3000", + "30499": "blueprints-processor-http", + "31110": "aaf-service", + "31111": "aaf-locate", + "31112": "aaf-oauth", + "31113": "aaf-hello", + "31114": "aaf-cm", + "31115": "aaf-hello", + "31116": "aaf-hello", + "31907": "dmaap-dr-prov2", + "32010": "xport-t-11011" } diff --git a/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json b/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json index 2792cfde..a0f14a3b 100644 --- a/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json +++ b/robot/assets/templates/vcpeutils/template.vcpe_bng_vfmodule.json @@ -1,172 +1,170 @@ { - "VNF-API:input": { - "VNF-API:request-information": { - "VNF-API:request-id": "robot12", - "VNF-API:notification-url": "https://so.onap.org", - "VNF-API:order-number": "robot12", - "VNF-API:request-sub-action": "SUPP", - "VNF-API:request-action": "PreloadVNFRequest", - "VNF-API:source": "VID", - "VNF-API:order-version": "1.0" - }, - "VNF-API:sdnc-request-header": { - "VNF-API:svc-action": "reserve", - "VNF-API:svc-notification-url": "https://son.onap.org", - "VNF-API:svc-request-id": "robot12" - }, - "VNF-API:vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-type": "${vnf_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}", - "vnf-name": "${vnf_name}" - }, - "VNF-API:vnf-parameters": [ - { - "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vbng-casa-base-ubuntu-16-04" - }, - { - "vnf-parameter-name": "vcpe_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" - }, - { - "vnf-parameter-name": "brgemu_bng_private_net_id", - "vnf-parameter-value": "${brg_bng_net}" - }, - { - "vnf-parameter-name": "brgemu_bng_private_subnet_id", - "vnf-parameter-value": "${brg_bng_subnet}" - }, - { - "vnf-parameter-name": "bng_gmux_private_net_id", - "vnf-parameter-value": "${bng_mux_net}" - }, - { - "vnf-parameter-name": "bng_gmux_private_subnet_id", - "vnf-parameter-value": "${bng_mux_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" - }, - { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, - { - "vnf-parameter-name": "cpe_signal_net_id", - "vnf-parameter-value": "${cpe_signal_net}" - }, - { - "vnf-parameter-name": "cpe_signal_subnet_id", - "vnf-parameter-value": "${cpe_signal_subnet}" - }, - { - "vnf-parameter-name": "brgemu_bng_private_net_cidr", - "vnf-parameter-value": "10.3.0.0/24" - }, - { - "vnf-parameter-name": "bng_gmux_private_net_cidr", - "vnf-parameter-value": "10.1.0.0/24" - }, - { - "vnf-parameter-name": "cpe_signal_private_net_cidr", - "vnf-parameter-value": "10.4.0.0/24" - }, - { - "vnf-parameter-name": "sdnc_ip_addr", - "vnf-parameter-value": "${sdnc_oam_ip}" - }, - { - "vnf-parameter-name": "vbng_private_ip_0", - "vnf-parameter-value": "10.3.0.1" - }, - { - "vnf-parameter-name": "vbng_private_ip_1", - "vnf-parameter-value": "10.0.101.10" - }, - { - "vnf-parameter-name": "vbng_private_ip_2", - "vnf-parameter-value": "10.4.0.3" - }, - { - "vnf-parameter-name": "vbng_private_ip_3", - "vnf-parameter-value": "10.1.0.10" - }, - { - "vnf-parameter-name": "vbng_name_0", - "vnf-parameter-value": "zdcpe1cpe01bng01_${suffix}" - }, - { - "vnf-parameter-name": "vnf_id", - "vnf-parameter-value": "vCPE_Infrastructure_Metro_vBNG_demo_app" - }, - { - "vnf-parameter-name": "vf_module_id", - "vnf-parameter-value": "vCPE_Intrastructure_Metro_vBNG" - }, - { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "10.0.4.102" - }, - { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "8080" - }, - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "script_version", - "vnf-parameter-value": "1.3.0" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vbng_key" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - }, - { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, - { - "vnf-parameter-name": "vpp_source_repo_url", - "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" - }, - { - "vnf-parameter-name": "vpp_source_repo_branch", - "vnf-parameter-value": "stable/1704" - }, - { - "vnf-parameter-name": "vpp_patch_url", - "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch" - } - ], - "VNF-API:vnf-assignments": { - } - } - } + "VNF-API:input": { + "VNF-API:request-information": { + "VNF-API:request-id": "robot12", + "VNF-API:notification-url": "https://so.onap.org", + "VNF-API:order-number": "robot12", + "VNF-API:request-sub-action": "SUPP", + "VNF-API:request-action": "PreloadVNFRequest", + "VNF-API:source": "VID", + "VNF-API:order-version": "1.0" + }, + "VNF-API:sdnc-request-header": { + "VNF-API:svc-action": "reserve", + "VNF-API:svc-notification-url": "https://son.onap.org", + "VNF-API:svc-request-id": "robot12" + }, + "VNF-API:vnf-topology-information": { + "vnf-topology-identifier": { + "service-type": "${service_type}", + "vnf-type": "${vnf_type}", + "generic-vnf-name": "${generic_vnf_name}", + "generic-vnf-type": "${generic_vnf_type}", + "vnf-name": "${vnf_name}" + }, + "VNF-API:vnf-parameters": [ + { + "vnf-parameter-name": "vcpe_image_name", + "vnf-parameter-value": "vbng-casa-base-ubuntu-16-04" + }, + { + "vnf-parameter-name": "vcpe_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "${public_net_id}" + }, + { + "vnf-parameter-name": "brgemu_bng_private_net_id", + "vnf-parameter-value": "${brg_bng_net}" + }, + { + "vnf-parameter-name": "brgemu_bng_private_subnet_id", + "vnf-parameter-value": "${brg_bng_subnet}" + }, + { + "vnf-parameter-name": "bng_gmux_private_net_id", + "vnf-parameter-value": "${bng_mux_net}" + }, + { + "vnf-parameter-name": "bng_gmux_private_subnet_id", + "vnf-parameter-value": "${bng_mux_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "${oam_onap_net}" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "${oam_onap_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "cpe_signal_net_id", + "vnf-parameter-value": "${cpe_signal_net}" + }, + { + "vnf-parameter-name": "cpe_signal_subnet_id", + "vnf-parameter-value": "${cpe_signal_subnet}" + }, + { + "vnf-parameter-name": "brgemu_bng_private_net_cidr", + "vnf-parameter-value": "10.3.0.0/24" + }, + { + "vnf-parameter-name": "bng_gmux_private_net_cidr", + "vnf-parameter-value": "10.1.0.0/24" + }, + { + "vnf-parameter-name": "cpe_signal_private_net_cidr", + "vnf-parameter-value": "10.4.0.0/24" + }, + { + "vnf-parameter-name": "sdnc_ip_addr", + "vnf-parameter-value": "${sdnc_oam_ip}" + }, + { + "vnf-parameter-name": "vbng_private_ip_0", + "vnf-parameter-value": "10.3.0.1" + }, + { + "vnf-parameter-name": "vbng_private_ip_1", + "vnf-parameter-value": "10.0.101.10" + }, + { + "vnf-parameter-name": "vbng_private_ip_2", + "vnf-parameter-value": "10.4.0.3" + }, + { + "vnf-parameter-name": "vbng_private_ip_3", + "vnf-parameter-value": "10.1.0.10" + }, + { + "vnf-parameter-name": "vbng_name_0", + "vnf-parameter-value": "zdcpe1cpe01bng01_${suffix}" + }, + { + "vnf-parameter-name": "vnf_id", + "vnf-parameter-value": "vCPE_Infrastructure_Metro_vBNG_demo_app" + }, + { + "vnf-parameter-name": "vf_module_id", + "vnf-parameter-value": "vCPE_Intrastructure_Metro_vBNG" + }, + { + "vnf-parameter-name": "dcae_collector_ip", + "vnf-parameter-value": "10.0.4.102" + }, + { + "vnf-parameter-name": "dcae_collector_port", + "vnf-parameter-value": "8080" + }, + { + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" + }, + { + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vbng_key" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "${pub_key}" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vpp_source_repo_url", + "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" + }, + { + "vnf-parameter-name": "vpp_source_repo_branch", + "vnf-parameter-value": "stable/1704" + }, + { + "vnf-parameter-name": "vpp_patch_url", + "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-radius-client-for-vbng/src/patches/Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch" + } + ], + "VNF-API:vnf-assignments": {} + } + } } - diff --git a/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json b/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json index 2630ee7a..cf788886 100644 --- a/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json +++ b/robot/assets/templates/vcpeutils/template.vcpe_brgemu_vfmodule.json @@ -1,138 +1,138 @@ { - "VNF-API:input": { - "VNF-API:request-information": { - "VNF-API:notification-url": "https://so.onap.org", - "VNF-API:order-number": "robot12", - "VNF-API:order-version": "1.0", - "VNF-API:request-action": "PreloadVNFRequest", - "VNF-API:request-id": "robot12", - "VNF-API:request-sub-action": "SUPP", - "VNF-API:source": "VID" - }, - "VNF-API:sdnc-request-header": { - "VNF-API:svc-action": "reserve", - "VNF-API:svc-notification-url": "https://son.onap.org", - "VNF-API:svc-request-id": "robot12" - }, - "VNF-API:vnf-topology-information": { - "VNF-API:vnf-assignments": {}, - "VNF-API:vnf-parameters": [ - { - "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04" - }, - { - "vnf-parameter-name": "vcpe_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" - }, - { - "vnf-parameter-name": "vbrgemu_bng_private_net_id", - "vnf-parameter-value": "${brg_bng_net}" - }, - { - "vnf-parameter-name": "vbrgemu_bng_private_subnet_id", - "vnf-parameter-value": "${brg_bng_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" - }, - { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, - { - "vnf-parameter-name": "compile_state", - "vnf-parameter-value": "done" - }, - { - "vnf-parameter-name": "vbrgemu_bng_private_net_cidr", - "vnf-parameter-value": "10.3.0.0/24" - }, - { - "vnf-parameter-name": "vbrgemu_private_ip_0", - "vnf-parameter-value": "10.3.0.21" - }, - { - "vnf-parameter-name": "sdnc_ip", - "vnf-parameter-value": "${sdnc_oam_ip}" - }, - { - "vnf-parameter-name": "vbrgemu_name_0", - "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}" - }, - { - "vnf-parameter-name": "vnf_id", - "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}" - }, - { - "vnf-parameter-name": "vf_module_id", - "vnf-parameter-value": "vCPE_Customer_BRGEMU_${suffix}" - }, - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "script_version", - "vnf-parameter-value": "1.3.0" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vbrgemu_key" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - }, - { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, - { - "vnf-parameter-name": "vpp_source_repo_url", - "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" - }, - { - "vnf-parameter-name": "vpp_source_repo_branch", - "vnf-parameter-value": "stable/1704" - }, - { - "vnf-parameter-name": "hc2vpp_source_repo_url", - "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp" - }, - { - "vnf-parameter-name": "hc2vpp_source_repo_branch", - "vnf-parameter-value": "stable/1704" - }, - { - "vnf-parameter-name": "vpp_patch_url", - "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch" - } - ], - "vnf-topology-identifier": { - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}", - "service-type": "${service_type}", - "vnf-name": "${vnf_name}", - "vnf-type": "${vnf_type}" - } + "VNF-API:input": { + "VNF-API:request-information": { + "VNF-API:notification-url": "https://so.onap.org", + "VNF-API:order-number": "robot12", + "VNF-API:order-version": "1.0", + "VNF-API:request-action": "PreloadVNFRequest", + "VNF-API:request-id": "robot12", + "VNF-API:request-sub-action": "SUPP", + "VNF-API:source": "VID" + }, + "VNF-API:sdnc-request-header": { + "VNF-API:svc-action": "reserve", + "VNF-API:svc-notification-url": "https://son.onap.org", + "VNF-API:svc-request-id": "robot12" + }, + "VNF-API:vnf-topology-information": { + "VNF-API:vnf-assignments": {}, + "VNF-API:vnf-parameters": [ + { + "vnf-parameter-name": "vcpe_image_name", + "vnf-parameter-value": "vbrg-casa-base-ubuntu-16-04" + }, + { + "vnf-parameter-name": "vcpe_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "${public_net_id}" + }, + { + "vnf-parameter-name": "vbrgemu_bng_private_net_id", + "vnf-parameter-value": "${brg_bng_net}" + }, + { + "vnf-parameter-name": "vbrgemu_bng_private_subnet_id", + "vnf-parameter-value": "${brg_bng_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "${oam_onap_net}" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "${oam_onap_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "compile_state", + "vnf-parameter-value": "done" + }, + { + "vnf-parameter-name": "vbrgemu_bng_private_net_cidr", + "vnf-parameter-value": "10.3.0.0/24" + }, + { + "vnf-parameter-name": "vbrgemu_private_ip_0", + "vnf-parameter-value": "10.3.0.21" + }, + { + "vnf-parameter-name": "sdnc_ip", + "vnf-parameter-value": "${sdnc_oam_ip}" + }, + { + "vnf-parameter-name": "vbrgemu_name_0", + "vnf-parameter-value": "zdcpe1cpe01brgemu01_${suffix}" + }, + { + "vnf-parameter-name": "vnf_id", + "vnf-parameter-value": "vCPE_Infrastructure_BGREMU_demo_app_${suffix}" + }, + { + "vnf-parameter-name": "vf_module_id", + "vnf-parameter-value": "vCPE_Customer_BRGEMU_${suffix}" + }, + { + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" + }, + { + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vbrgemu_key" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "${pub_key}" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vpp_source_repo_url", + "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" + }, + { + "vnf-parameter-name": "vpp_source_repo_branch", + "vnf-parameter-value": "stable/1704" + }, + { + "vnf-parameter-name": "hc2vpp_source_repo_url", + "vnf-parameter-value": "https://gerrit.fd.io/r/hc2vpp" + }, + { + "vnf-parameter-name": "hc2vpp_source_repo_branch", + "vnf-parameter-value": "stable/1704" + }, + { + "vnf-parameter-name": "vpp_patch_url", + "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-option-82-for-vbrg/src/patches/VPP-Add-Option82-Nat-Filter-For-vBRG.patch" } + ], + "vnf-topology-identifier": { + "generic-vnf-name": "${generic_vnf_name}", + "generic-vnf-type": "${generic_vnf_type}", + "service-type": "${service_type}", + "vnf-name": "${vnf_name}", + "vnf-type": "${vnf_type}" + } } + } } diff --git a/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json b/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json index a1ebf2ad..ad0f9184 100644 --- a/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json +++ b/robot/assets/templates/vcpeutils/template.vcpe_gmux_vfmodule.json @@ -1,160 +1,158 @@ { - "VNF-API:input": { - "VNF-API:request-information": { - "VNF-API:request-id": "robot12", - "VNF-API:notification-url": "https://so.onap.org", - "VNF-API:order-number": "robot12", - "VNF-API:request-sub-action": "SUPP", - "VNF-API:request-action": "PreloadVNFRequest", - "VNF-API:source": "VID", - "VNF-API:order-version": "1.0" - }, - "VNF-API:sdnc-request-header": { - "VNF-API:svc-action": "reserve", - "VNF-API:svc-notification-url": "https://son.onap.org", - "VNF-API:svc-request-id": "robot12" - }, - "VNF-API:vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-type": "${vnf_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}", - "vnf-name": "${vnf_name}" - }, - "VNF-API:vnf-parameters": [ - { - "vnf-parameter-name": "vcpe_image_name", - "vnf-parameter-value": "vgmux-casa-base-ubuntu-16-04" - }, - { - "vnf-parameter-name": "vcpe_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" - }, - { - "vnf-parameter-name": "bng_gmux_private_net_id", - "vnf-parameter-value": "${bng_mux_net}" - }, - { - "vnf-parameter-name": "bng_gmux_private_subnet_id", - "vnf-parameter-value": "${bng_mux_subnet}" - }, - { - "vnf-parameter-name": "mux_gw_private_net_id", - "vnf-parameter-value": "${mux_gw_net}" - }, - { - "vnf-parameter-name": "mux_gw_private_subnet_id", - "vnf-parameter-value": "${mux_gw_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${oam_onap_net}" - }, - { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${oam_onap_subnet}" - }, - { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, - { - "vnf-parameter-name": "mux_gw_private_net_cidr", - "vnf-parameter-value": "10.5.0.0/24" - }, - { - "vnf-parameter-name": "bng_gmux_private_net_cidr", - "vnf-parameter-value": "10.1.0.0/24" - }, - { - "vnf-parameter-name": "vgmux_private_ip_0", - "vnf-parameter-value": "10.1.0.21" - }, - { - "vnf-parameter-name": "vgmux_private_ip_1", - "vnf-parameter-value": "10.0.101.21" - }, - { - "vnf-parameter-name": "vgmux_private_ip_2", - "vnf-parameter-value": "10.5.0.21" - }, - { - "vnf-parameter-name": "vgmux_name_0", - "vnf-parameter-value": "zdcpe1cpe01mux01_${suffix}" - }, - { - "vnf-parameter-name": "vnf_id", - "vnf-parameter-value": "vCPE_Infrastructure_Metro_vGMUX_demo_app" - }, - { - "vnf-parameter-name": "vf_module_id", - "vnf-parameter-value": "vCPE_Intrastructure_Metro_vGMUX" - }, - { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "10.0.4.102" - }, - { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "8080" - }, - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "1.1.1" - }, - { - "vnf-parameter-name": "script_version", - "vnf-parameter-value": "1.3.0" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "vgmux_key" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - }, - { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, - { - "vnf-parameter-name": "vpp_source_repo_url", - "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" - }, - { - "vnf-parameter-name": "vpp_source_repo_branch", - "vnf-parameter-value": "stable/1704" - }, - { - "vnf-parameter-name": "vpp_patch_url", - "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch" - }, - { - "vnf-parameter-name": "hc2vpp_patch_url", - "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch" - }, - { - "vnf-parameter-name": "libevel_patch_url", - "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch" - } - ], - "VNF-API:vnf-assignments": { - } - } - } + "VNF-API:input": { + "VNF-API:request-information": { + "VNF-API:request-id": "robot12", + "VNF-API:notification-url": "https://so.onap.org", + "VNF-API:order-number": "robot12", + "VNF-API:request-sub-action": "SUPP", + "VNF-API:request-action": "PreloadVNFRequest", + "VNF-API:source": "VID", + "VNF-API:order-version": "1.0" + }, + "VNF-API:sdnc-request-header": { + "VNF-API:svc-action": "reserve", + "VNF-API:svc-notification-url": "https://son.onap.org", + "VNF-API:svc-request-id": "robot12" + }, + "VNF-API:vnf-topology-information": { + "vnf-topology-identifier": { + "service-type": "${service_type}", + "vnf-type": "${vnf_type}", + "generic-vnf-name": "${generic_vnf_name}", + "generic-vnf-type": "${generic_vnf_type}", + "vnf-name": "${vnf_name}" + }, + "VNF-API:vnf-parameters": [ + { + "vnf-parameter-name": "vcpe_image_name", + "vnf-parameter-value": "vgmux-casa-base-ubuntu-16-04" + }, + { + "vnf-parameter-name": "vcpe_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "${public_net_id}" + }, + { + "vnf-parameter-name": "bng_gmux_private_net_id", + "vnf-parameter-value": "${bng_mux_net}" + }, + { + "vnf-parameter-name": "bng_gmux_private_subnet_id", + "vnf-parameter-value": "${bng_mux_subnet}" + }, + { + "vnf-parameter-name": "mux_gw_private_net_id", + "vnf-parameter-value": "${mux_gw_net}" + }, + { + "vnf-parameter-name": "mux_gw_private_subnet_id", + "vnf-parameter-value": "${mux_gw_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "${oam_onap_net}" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "${oam_onap_subnet}" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "mux_gw_private_net_cidr", + "vnf-parameter-value": "10.5.0.0/24" + }, + { + "vnf-parameter-name": "bng_gmux_private_net_cidr", + "vnf-parameter-value": "10.1.0.0/24" + }, + { + "vnf-parameter-name": "vgmux_private_ip_0", + "vnf-parameter-value": "10.1.0.21" + }, + { + "vnf-parameter-name": "vgmux_private_ip_1", + "vnf-parameter-value": "10.0.101.21" + }, + { + "vnf-parameter-name": "vgmux_private_ip_2", + "vnf-parameter-value": "10.5.0.21" + }, + { + "vnf-parameter-name": "vgmux_name_0", + "vnf-parameter-value": "zdcpe1cpe01mux01_${suffix}" + }, + { + "vnf-parameter-name": "vnf_id", + "vnf-parameter-value": "vCPE_Infrastructure_Metro_vGMUX_demo_app" + }, + { + "vnf-parameter-name": "vf_module_id", + "vnf-parameter-value": "vCPE_Intrastructure_Metro_vGMUX" + }, + { + "vnf-parameter-name": "dcae_collector_ip", + "vnf-parameter-value": "10.0.4.102" + }, + { + "vnf-parameter-name": "dcae_collector_port", + "vnf-parameter-value": "8080" + }, + { + "vnf-parameter-name": "repo_url_blob", + "vnf-parameter-value": "https://nexus.onap.org/content/sites/raw" + }, + { + "vnf-parameter-name": "repo_url_artifacts", + "vnf-parameter-value": "https://nexus.onap.org/content/repositories/releases" + }, + { + "vnf-parameter-name": "demo_artifacts_version", + "vnf-parameter-value": "1.1.1" + }, + { + "vnf-parameter-name": "script_version", + "vnf-parameter-value": "1.3.0" + }, + { + "vnf-parameter-name": "key_name", + "vnf-parameter-value": "vgmux_key" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "${pub_key}" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "vpp_source_repo_url", + "vnf-parameter-value": "https://gerrit.fd.io/r/vpp" + }, + { + "vnf-parameter-name": "vpp_source_repo_branch", + "vnf-parameter-value": "stable/1704" + }, + { + "vnf-parameter-name": "vpp_patch_url", + "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch" + }, + { + "vnf-parameter-name": "hc2vpp_patch_url", + "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch" + }, + { + "vnf-parameter-name": "libevel_patch_url", + "vnf-parameter-value": "https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch" + } + ], + "VNF-API:vnf-assignments": {} + } + } } - diff --git a/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json b/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json index d456a105..6081ad2c 100644 --- a/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json +++ b/robot/assets/templates/vcpeutils/template.vfw_vfmodule.json @@ -1,143 +1,142 @@ { - "VNF-API:input": { - "VNF-API:request-information": { - "VNF-API:request-id": "robot12", - "VNF-API:notification-url": "https://so.onap.org", - "VNF-API:order-number": "robot12", - "VNF-API:request-sub-action": "SUPP", - "VNF-API:request-action": "PreloadVNFRequest", - "VNF-API:source": "VID", - "VNF-API:order-version": "1.0" - }, - "VNF-API:sdnc-request-header": { - "VNF-API:svc-action": "reserve", - "VNF-API:svc-notification-url": "https://son.onap.org", - "VNF-API:svc-request-id": "robot12" - }, - "VNF-API:vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-type": "${vnf_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}", - "vnf-name": "${vnf_name}" - }, - "VNF-API:vnf-parameters": [ - { - "vnf-parameter-name": "unprotected_private_net_id" , - "vnf-parameter-value" : "demofwl_unprotected" - }, - { - "vnf-parameter-name": "unprotected_private_net_cidr" , - "vnf-parameter-value" : "192.168.110.0/24" - }, - { - "vnf-parameter-name": "protected_private_net_id" , - "vnf-parameter-value" : "demofwl_protected" - }, - { - "vnf-parameter-name": "protected_private_net_cidr" , - "vnf-parameter-value" : "192.168.120.0/24" - }, - { - "vnf-parameter-name": "vfw_int_unprotected_private_ip_0" , - "vnf-parameter-value" : "192.168.110.100" - }, - { - "vnf-parameter-name": "vfw_int_protected_private_ip_0" , - "vnf-parameter-value" : "192.168.120.100" - }, - { - "vnf-parameter-name": "vfw_onap_private_ip_0" , - "vnf-parameter-value" : "10.0.${ecompnet}.11" - }, - { - "vnf-parameter-name": "vpg_int_unprotected_private_ip_0" , - "vnf-parameter-value" : "192.168.110.200" - }, - { - "vnf-parameter-name": "vfw_int_protected_private_floating_ip" , - "vnf-parameter-value" : "192.168.110.200" - }, - { - "vnf-parameter-name": "vpg_onap_private_ip_0" , - "vnf-parameter-value" : "10.0.${ecompnet}.12" - }, - { - "vnf-parameter-name": "vsn_int_protected_private_ip_0" , - "vnf-parameter-value" : "192.168.120.250" - }, - { - "vnf-parameter-name": "vsn_onap_private_ip_0" , - "vnf-parameter-value" : "10.0.${ecompnet}.13" - }, - { - "vnf-parameter-name": "sec_group" , - "vnf-parameter-value" : "${sec_group}" - }, - { - "vnf-parameter-name": "vfw_name_0", - "vnf-parameter-value" :"demofwl01fwl" - }, - { - "vnf-parameter-name": "vpg_name_0", - "vnf-parameter-value" : "demofwl01pgn" - }, - { - "vnf-parameter-name": "vsn_name_0", - "vnf-parameter-value": "demofwl01snk" - }, - { - "vnf-parameter-name": "vfw_image_name", - "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" - }, - { - "vnf-parameter-name": "vfw_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - { - "vnf-parameter-name": "vpg_image_name", - "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" - }, - { - "vnf-parameter-name": "vpg_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - { - "vnf-parameter-name": "vsn_image_name", - "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" - }, - { - "vnf-parameter-name": "vsn_flavor_name", - "vnf-parameter-value": "m1.medium" - }, - { - "vnf-parameter-name": "public_net_id", - "vnf-parameter-value": "${public_net_id}" - }, - { - "vnf-parameter-name": "onap_private_net_id", - "vnf-parameter-value": "${onap_private_net_id}" - }, - { - "vnf-parameter-name": "onap_private_subnet_id", - "vnf-parameter-value": "${onap_private_subnet_id}" - }, - { - "vnf-parameter-name": "onap_private_net_cidr", - "vnf-parameter-value": "10.0.0.0/16" - }, - { - "vnf-parameter-name": "cloud_env", - "vnf-parameter-value": "openstack" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - } - ], - "VNF-API:vnf-assignments": { - } - } - } + "VNF-API:input": { + "VNF-API:request-information": { + "VNF-API:request-id": "robot12", + "VNF-API:notification-url": "https://so.onap.org", + "VNF-API:order-number": "robot12", + "VNF-API:request-sub-action": "SUPP", + "VNF-API:request-action": "PreloadVNFRequest", + "VNF-API:source": "VID", + "VNF-API:order-version": "1.0" + }, + "VNF-API:sdnc-request-header": { + "VNF-API:svc-action": "reserve", + "VNF-API:svc-notification-url": "https://son.onap.org", + "VNF-API:svc-request-id": "robot12" + }, + "VNF-API:vnf-topology-information": { + "vnf-topology-identifier": { + "service-type": "${service_type}", + "vnf-type": "${vnf_type}", + "generic-vnf-name": "${generic_vnf_name}", + "generic-vnf-type": "${generic_vnf_type}", + "vnf-name": "${vnf_name}" + }, + "VNF-API:vnf-parameters": [ + { + "vnf-parameter-name": "unprotected_private_net_id", + "vnf-parameter-value": "demofwl_unprotected" + }, + { + "vnf-parameter-name": "unprotected_private_net_cidr", + "vnf-parameter-value": "192.168.110.0/24" + }, + { + "vnf-parameter-name": "protected_private_net_id", + "vnf-parameter-value": "demofwl_protected" + }, + { + "vnf-parameter-name": "protected_private_net_cidr", + "vnf-parameter-value": "192.168.120.0/24" + }, + { + "vnf-parameter-name": "vfw_int_unprotected_private_ip_0", + "vnf-parameter-value": "192.168.110.100" + }, + { + "vnf-parameter-name": "vfw_int_protected_private_ip_0", + "vnf-parameter-value": "192.168.120.100" + }, + { + "vnf-parameter-name": "vfw_onap_private_ip_0", + "vnf-parameter-value": "10.0.${ecompnet}.11" + }, + { + "vnf-parameter-name": "vpg_int_unprotected_private_ip_0", + "vnf-parameter-value": "192.168.110.200" + }, + { + "vnf-parameter-name": "vfw_int_protected_private_floating_ip", + "vnf-parameter-value": "192.168.110.200" + }, + { + "vnf-parameter-name": "vpg_onap_private_ip_0", + "vnf-parameter-value": "10.0.${ecompnet}.12" + }, + { + "vnf-parameter-name": "vsn_int_protected_private_ip_0", + "vnf-parameter-value": "192.168.120.250" + }, + { + "vnf-parameter-name": "vsn_onap_private_ip_0", + "vnf-parameter-value": "10.0.${ecompnet}.13" + }, + { + "vnf-parameter-name": "sec_group", + "vnf-parameter-value": "${sec_group}" + }, + { + "vnf-parameter-name": "vfw_name_0", + "vnf-parameter-value": "demofwl01fwl" + }, + { + "vnf-parameter-name": "vpg_name_0", + "vnf-parameter-value": "demofwl01pgn" + }, + { + "vnf-parameter-name": "vsn_name_0", + "vnf-parameter-value": "demofwl01snk" + }, + { + "vnf-parameter-name": "vfw_image_name", + "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" + }, + { + "vnf-parameter-name": "vfw_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "vpg_image_name", + "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" + }, + { + "vnf-parameter-name": "vpg_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "vsn_image_name", + "vnf-parameter-value": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}" + }, + { + "vnf-parameter-name": "vsn_flavor_name", + "vnf-parameter-value": "m1.medium" + }, + { + "vnf-parameter-name": "public_net_id", + "vnf-parameter-value": "${public_net_id}" + }, + { + "vnf-parameter-name": "onap_private_net_id", + "vnf-parameter-value": "${onap_private_net_id}" + }, + { + "vnf-parameter-name": "onap_private_subnet_id", + "vnf-parameter-value": "${onap_private_subnet_id}" + }, + { + "vnf-parameter-name": "onap_private_net_cidr", + "vnf-parameter-value": "10.0.0.0/16" + }, + { + "vnf-parameter-name": "cloud_env", + "vnf-parameter-value": "openstack" + }, + { + "vnf-parameter-name": "pub_key", + "vnf-parameter-value": "${pub_key}" + } + ], + "VNF-API:vnf-assignments": {} + } + } } diff --git a/robot/assets/usecases/5gbulkpm/Notification.json b/robot/assets/usecases/5gbulkpm/Notification.json index db77c10b..31e624fe 100644 --- a/robot/assets/usecases/5gbulkpm/Notification.json +++ b/robot/assets/usecases/5gbulkpm/Notification.json @@ -1,33 +1,34 @@ { - "event": { - "commonEventHeader": { - "version": "4.0.1", - "vesEventListenerVersion": "7.0.1", - "domain": "notification", - "eventName": "Noti_RnNode-Ericsson_FileReady", - "eventId": "FileReady_1797490e-10ae-4d48-9ea7-3d7d790b25e1", - "lastEpochMicrosec": 8745745764578, - "priority": "Normal", - "reportingEntityName": "otenb5309", - "sequence": 0, - "sourceName": "oteNB5309", - "startEpochMicrosec": 8745745764578, - "timeZoneOffset": "UTC+05.30" - }, - "notificationFields": { - "changeIdentifier": "PM_MEAS_FILES", - "changeType": "FileReady", - "notificationFieldsVersion": "2.0", - "arrayOfNamedHashMap": [ - { "name": "test.xml.gz", - "hashMap":{ - "location": "sftp://sftp:22/test.xml.gz", - "compression": "gzip", - "fileFormatType": "org.3GPP.32.435#measCollec", - "fileFormatVersion": "V10" - } - } - ] + "event": { + "commonEventHeader": { + "version": "4.0.1", + "vesEventListenerVersion": "7.0.1", + "domain": "notification", + "eventName": "Noti_RnNode-Ericsson_FileReady", + "eventId": "FileReady_1797490e-10ae-4d48-9ea7-3d7d790b25e1", + "lastEpochMicrosec": 8745745764578, + "priority": "Normal", + "reportingEntityName": "otenb5309", + "sequence": 0, + "sourceName": "oteNB5309", + "startEpochMicrosec": 8745745764578, + "timeZoneOffset": "UTC+05.30" + }, + "notificationFields": { + "changeIdentifier": "PM_MEAS_FILES", + "changeType": "FileReady", + "notificationFieldsVersion": "2.0", + "arrayOfNamedHashMap": [ + { + "name": "test.xml.gz", + "hashMap": { + "location": "sftp://sftp:22/test.xml.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V10" + } + } + ] } + } } -}
\ No newline at end of file diff --git a/robot/assets/usecases/5gbulkpm/blueprintTemplate.json b/robot/assets/usecases/5gbulkpm/blueprintTemplate.json index 5615d2c3..f3b87e7d 100644 --- a/robot/assets/usecases/5gbulkpm/blueprintTemplate.json +++ b/robot/assets/usecases/5gbulkpm/blueprintTemplate.json @@ -1,12 +1,12 @@ { - "asdcResourceId": "", - "asdcServiceId": "", - "asdcServiceURL": "", - "blueprintTemplate": "", - "owner": "robot", - "serviceIds": [], - "serviceLocations": [], - "typeName": "", - "typeVersion": 100, - "vnfTypes": [] -}
\ No newline at end of file + "asdcResourceId": "", + "asdcServiceId": "", + "asdcServiceURL": "", + "blueprintTemplate": "", + "owner": "robot", + "serviceIds": [], + "serviceLocations": [], + "typeName": "", + "typeVersion": 100, + "vnfTypes": [] +} diff --git a/robot/assets/usecases/5gbulkpm/mr_clusters.json b/robot/assets/usecases/5gbulkpm/mr_clusters.json index f3b3d51c..9e732d2a 100644 --- a/robot/assets/usecases/5gbulkpm/mr_clusters.json +++ b/robot/assets/usecases/5gbulkpm/mr_clusters.json @@ -1,6 +1,6 @@ { - "dcaeLocationName": "san-francisco", - "fqdn": "message-router", - "topicProtocol": "http", - "topicPort": "3904" -}
\ No newline at end of file + "dcaeLocationName": "san-francisco", + "fqdn": "message-router", + "topicProtocol": "http", + "topicPort": "3904" +} diff --git a/robot/assets/usecases/5gbulkpm/sub.json b/robot/assets/usecases/5gbulkpm/sub.json index c889bb3d..45554b9a 100644 --- a/robot/assets/usecases/5gbulkpm/sub.json +++ b/robot/assets/usecases/5gbulkpm/sub.json @@ -1,10 +1,10 @@ { - "dcaeLocationName": "san-francisco", - "fqtn": "org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS", - "clientIdentity": "dcae@dcae.onap.org", - "action": [ - "view", - "pub", - "sub" - ] -}
\ No newline at end of file + "dcaeLocationName": "san-francisco", + "fqtn": "org.onap.dmaap.mr.PERFORMANCE_MEASUREMENTS", + "clientIdentity": "dcae@dcae.onap.org", + "action": [ + "view", + "pub", + "sub" + ] +} |