summaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/test/resources
diff options
context:
space:
mode:
Diffstat (limited to 'vid-app-common/src/test/resources')
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties39
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml25
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml34
-rw-r--r--vid-app-common/src/test/resources/cacheConfig.json13
-rw-r--r--vid-app-common/src/test/resources/cr-csar.JSON6
-rw-r--r--vid-app-common/src/test/resources/csv_files/csv_to_json.csv2
-rw-r--r--vid-app-common/src/test/resources/fabric-configuration.json52
-rw-r--r--vid-app-common/src/test/resources/fabric-real-sriov-configuration.json51
-rw-r--r--vid-app-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker1
-rw-r--r--vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json200
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json19
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json34
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json32
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json (renamed from vid-app-common/src/test/resources/payload_jsons/bulk_service_request.json)2
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json9
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json1
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json21
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json48
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json47
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json47
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json36
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json48
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json47
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json17
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json16
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json17
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json69
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json59
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json60
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json56
-rw-r--r--vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON9
-rw-r--r--vid-app-common/src/test/resources/policy-configuration-csar.JSON33
-rw-r--r--vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json119
-rw-r--r--vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json11
-rw-r--r--vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json19
-rw-r--r--vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json68
-rw-r--r--vid-app-common/src/test/resources/vf-csar.JSON12
-rw-r--r--vid-app-common/src/test/resources/vf-with-annotation-csar.json102
-rw-r--r--vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json9
-rw-r--r--vid-app-common/src/test/resources/vl-csar.JSON9
-rw-r--r--vid-app-common/src/test/resources/vlan-tagging.json222
-rw-r--r--vid-app-common/src/test/resources/vnf-grouping-csar.json145
-rw-r--r--vid-app-common/src/test/resources/vnfConfigUpdatePayload.json2
43 files changed, 1716 insertions, 152 deletions
diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties b/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
index 3d8e8155a..f35bf2d64 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/conf/fusion.properties
@@ -1,50 +1,27 @@
-# domain settings
-#domain_class_location = com.att.fusion.domain.
-
-# validator settings
-#default_error_message = Default error message
-
# login settings
-login_method_csp = csp
-login_method_web_junction = web_junction
login_method_backdoor = backdoor
+login_method_web_junction = login_method_web_junction
+login_method_csp = login_method_csp
login_method_attribute_name = login_method
+authentication_mechanism = BOTH
+role_function_list = role_funcion_list
#login message
login.error.hrid.empty = Login failed, please contact system administrator.
login.error.hrid.not-found = User not found, please contact system administrator.
login.error.user.inactive = Account is disabled, please contact system administrator.
-# CSP settings
-csp_cookie_name = attESSec
-csp_gate_keeper_data_key = MgmtSysCtr
-csp_gate_keeper_prod_key = PROD
-csp_login_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/?sysName=MgmtSysCtr&retURL=
-csp_logout_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogout/?retURL=
-
-authentication_mechanism = BOTH
-
-#csp_gate_keeper_prod_key = DEVL
-user_attribute_name = user
-#csp_login_url = https://www.e-access.att.com/empsvcs/hrpinmgt/pagLogin/?sysName=MgmtSysCtr&retURL=
-#csp_logout_url = https://webtest.csp.att.com/empsvcs/hrpinmgt/pagLogout/?retURL=
-
-# Web Junction settings
-#web_junction_user_id_header_name = iv-user
-
# User Session settings
-#user_attribute_name = user
+user_attribute_name = user
roles_attribute_name = roles
role_functions_attribute_name = role_functions
-role_function_list = role_function_list
#client_device_attribute_name = client_device
#client_device_emulation = false
-#client_device_type_to_emulate = com.att.fusion.web.clientdevice.mobile.IPhoneDevice
-# POST settings
+# Import-user LDAP settings
post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory
-post_provider_url = ldap://ldap.webphone.att.com:389
-post_security_principal = ou=people,o=att,c=us
+post_provider_url = ldap://ldap.mycompany.com:389
+post_security_principal = ou=people,o=mycompany,c=us
post_max_result_size = 499
# menu settings
diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml b/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
index c9e10a16b..caefb19c8 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/defs/definitions.xml
@@ -2,11 +2,6 @@
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
"http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
-
-<!-- This tiles definitions file is fusion/defs/definitions.xml. It maps
- tokens used by SDK-core controllers to JSP file paths. To minimize upgrade
- effort, this file should not be changed by on-boarding applications. -->
-
<tiles-definitions>
<definition name="ebz_template" template="/WEB-INF/fusion/jsp/ebz_template.jsp">
@@ -93,11 +88,6 @@
value="/WEB-INF/fusion/jsp/collaborateList.jsp"></put-attribute>
</definition>
- <!-- <definition extends="ebz_template" name="notebook">
- <put-attribute name="body"
- value="/WEB-INF/fusion/jsp/notebook.jsp"></put-attribute>
- </definition> -->
-
<definition name="notebook"
template="app/fusion/notebook-integration/scripts/view-models/notebook.htm" />
@@ -138,18 +128,9 @@
</definition> -->
<definition name="collaboration"
template="/WEB-INF/fusion/jsp/webrtc/collaboration.jsp" />
- <definition name="user_profile_list"
- template="/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html" />
- <definition name="admin"
- template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
- <definition name="workflows"
- template="/app/fusion/scripts/view-models/workflows/workflow-landing.html" />
- <definition name="report_dashboard"
- template="/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html" />
- <definition name="samplePage"
- template="/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html" />
- <definition name="ds2_sample" template="/app/fusionapp/scripts/DS2-view-models/sampleDS2.html" />
-
+ <definition name="user_profile_list" template="/app/fusion/scripts/view-models/admin-page/profile.html"/>
+ <definition name="admin" template="/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html" />
+ <definition name="workflows" template="/app/fusion/scripts/view-models/workflows/workflow-landing.html"/>
<definition extends="ebz_template" name="report_wizard">
<put-attribute name="body"
diff --git a/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml b/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
index 0f32e94fc..8f58185c1 100644
--- a/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
+++ b/vid-app-common/src/test/resources/WEB-INF/fusion/orm/RNoteBookIntegration.hbm.xml
@@ -1,12 +1,14 @@
<?xml version="1.0"?>
<!--
- ================================================================================
- eCOMP Portal SDK
- ================================================================================
- Copyright (C) 2017 AT&T Intellectual Property
- ================================================================================
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ ============LICENSE_START==========================================
+ ONAP Portal SDK
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+
+ Unless otherwise specified, all software contained herein is licensed
+ under the Apache License, Version 2.0 (the “License”);
+ you may not use this software except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
@@ -16,7 +18,23 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- ================================================================================
+
+ Unless otherwise specified, all documentation contained herein is licensed
+ under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ you may not use this documentation except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://creativecommons.org/licenses/by/4.0/
+
+ Unless required by applicable law or agreed to in writing, documentation
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ============LICENSE_END============================================
+
+ ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
<!DOCTYPE hibernate-mapping PUBLIC
diff --git a/vid-app-common/src/test/resources/cacheConfig.json b/vid-app-common/src/test/resources/cacheConfig.json
new file mode 100644
index 000000000..93ee1cbde
--- /dev/null
+++ b/vid-app-common/src/test/resources/cacheConfig.json
@@ -0,0 +1,13 @@
+{
+ "a" : {
+ "isActive": true,
+ "expireAfterWriteHours": 6,
+ "refreshAfterWriteSeconds": 9
+ },
+ "b" : {
+
+ },
+ "d" : {
+ "isActive": false
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/cr-csar.JSON b/vid-app-common/src/test/resources/cr-csar.JSON
index 4ae148932..b712cc779 100644
--- a/vid-app-common/src/test/resources/cr-csar.JSON
+++ b/vid-app-common/src/test/resources/cr-csar.JSON
@@ -36,7 +36,8 @@
"properties": {
"MSO_Example..NetworkCollection..0_network_collection_function": "fffff",
"MSO_Example..NetworkCollection..0_network_collection_description": "ddd",
- "MSO_Example..Fixed..0_quantity": "89"
+ "MSO_Example..Fixed..0_quantity": "89",
+ "ecomp_generated_naming": "false"
},
"type": "CR",
"category": "Network L2-3",
@@ -73,5 +74,6 @@
},
"pnfs": {
- }
+ },
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/csv_files/csv_to_json.csv b/vid-app-common/src/test/resources/csv_files/csv_to_json.csv
index 02229caf8..ecbc188b1 100644
--- a/vid-app-common/src/test/resources/csv_files/csv_to_json.csv
+++ b/vid-app-common/src/test/resources/csv_files/csv_to_json.csv
@@ -4,7 +4,7 @@ payload,request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm001dbg001
payload,request-parameters,[vm],[vnfc],vnfc-function-code,dbg
payload,request-parameters,[vm],[vnfc],vnfc-type,DBE-VM #1
payload,request-parameters,[vm],[vnfc],group-notation,ibcx0001vm001dbg001pair
-payload,request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,135.21.166.39
+payload,request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,10.2.3.4
payload,request-parameters,[vm],,vm-name,ibcx0001vm002
payload,request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm002dbg001
payload,request-parameters,[vm],[vnfc],vnfc-function-code,dbg
diff --git a/vid-app-common/src/test/resources/fabric-configuration.json b/vid-app-common/src/test/resources/fabric-configuration.json
new file mode 100644
index 000000000..ff17ca049
--- /dev/null
+++ b/vid-app-common/src/test/resources/fabric-configuration.json
@@ -0,0 +1,52 @@
+{
+ "service": {
+ "uuid": "12344bb4-a416-4b4e-997e-0059973630b9",
+ "invariantUuid": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9",
+ "name": "ADIOD vMX vPE_BV Service 488",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM",
+ "serviceEcompNaming": "true",
+ "instantiationType": "ClientConfig",
+ "inputs": {
+
+ }
+ },
+ "vnfs": {
+
+ },
+ "networks": {
+
+ },
+ "collectionResource": {},
+ "configurations": {
+
+ },
+ "fabricConfigurations": {
+ "Fabric Configuration 0": {
+ "invariantUuid" : "1608eef4-de53-4334-a8d2-ba79cab4bddd",
+ "uuid": "88379cfd-fa0f-4946-8958-acc32640ceee",
+ "customizationUuid": "1e7f6512-c1cf-4b96-b5f5-b22a212ddad0",
+ "version": "3.0",
+ "name": "Fabric Configuration Object",
+ "description": "Fabric Configuration Object",
+ "type": "Configuration"
+ }
+ },
+ "serviceProxies": {
+
+ },
+ "vfModules": {
+
+ },
+ "volumeGroups": {
+
+ },
+ "pnfs": {
+
+ },
+ "vnfGroups": {}
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json b/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json
new file mode 100644
index 000000000..d6efc2854
--- /dev/null
+++ b/vid-app-common/src/test/resources/fabric-real-sriov-configuration.json
@@ -0,0 +1,51 @@
+{
+ "service": {
+ "uuid": "253f1467-fe68-4e80-ba71-308000caec31",
+ "invariantUuid": "c15fe228-7d40-4f99-afa7-10abeedf9aac",
+ "name": "SRIOV-SERVICE",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "ST",
+ "serviceRole": "SR",
+ "description": "SRIOV-SERVICE",
+ "serviceEcompNaming": "true",
+ "instantiationType": "Macro",
+ "inputs": {
+
+ }
+ },
+ "vnfs": {
+
+ },
+ "networks": {
+
+ },
+ "collectionResource": {},
+ "configurations": {
+
+ },
+ "fabricConfigurations": {
+ "Fabric Configuration 0": {
+ "invariantUuid" : "2ccb488d-a119-4909-8ca5-5ecefe0ec299",
+ "uuid": "c496746f-054e-4234-88b9-aca4ebb7cbd2",
+ "customizationUuid": "9426b949-dc13-4dfe-baa0-931f42dc0e71",
+ "version": "2.0",
+ "name": "Fabric Configuration",
+ "description": "A fabric Configuration object",
+ "type": "Configuration"
+ }
+ },
+ "serviceProxies": {
+
+ },
+ "vfModules": {
+
+ },
+ "volumeGroups": {
+
+ },
+ "pnfs": {
+
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/vid-app-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 000000000..ca6ee9cea
--- /dev/null
+++ b/vid-app-common/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json b/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json
new file mode 100644
index 000000000..34f18f7fb
--- /dev/null
+++ b/vid-app-common/src/test/resources/orchestrationRequestsByServiceInstanceId.json
@@ -0,0 +1,200 @@
+{
+ "requestList": [{
+ "request": {
+ "requestId": "7f584c2c-2365-4f63-8088-592a13167621",
+ "startTime": "Mon, 05 Nov 2018 09:22:23 GMT",
+ "requestScope": "service",
+ "requestType": "createInstance",
+ "requestDetails": {
+ "modelInfo": {
+ "modelInvariantId": "1469946d-d566-467e-867b-88b29f6cb6c7",
+ "modelType": "service",
+ "modelName": "FCGI_5G_NC",
+ "modelVersion": "1.0",
+ "modelVersionId": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1",
+ "modelUuid": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1",
+ "modelInvariantUuid": "1469946d-d566-467e-867b-88b29f6cb6c7"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "instanceName": "dsfsdfsdfsdf",
+ "suppressRollback": false,
+ "requestorId": "us16807000"
+ },
+ "subscriberInfo": {
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89"
+ },
+ "requestParameters": {
+ "subscriptionServiceType": "VIRTUAL USP",
+ "aLaCarte": true,
+ "testApi": "VNF_API"
+ },
+ "project": {
+ "projectName": "DFW"
+ },
+ "owningEntity": {
+ "owningEntityId": "3f592a6f-459b-435e-b0d4-59959ab1d385",
+ "owningEntityName": "own1"
+ }
+ },
+ "instanceReferences": {
+ "serviceInstanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb",
+ "serviceInstanceName": "dsfsdfsdfsdf",
+ "requestorId": "us16807000"
+ },
+ "requestStatus": {
+ "requestState": "COMPLETE",
+ "statusMessage": "STATUS: Service Instance was created successfully.",
+ "percentProgress": 100,
+ "finishTime": "Mon, 05 Nov 2018 09:22:35 GMT"
+ }
+ }
+ }, {
+ "request": {
+ "requestId": "4222a819-f137-4bf1-b352-a27e53344f46",
+ "startTime": "Mon, 05 Nov 2018 09:22:41 GMT",
+ "requestScope": "vnf",
+ "requestType": "createInstance",
+ "requestDetails": {
+ "modelInfo": {
+ "modelCustomizationName": "FCGI 0",
+ "modelInvariantId": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c",
+ "modelType": "vnf",
+ "modelName": "FCGI",
+ "modelVersion": "1.0",
+ "modelCustomizationUuid": "de9b7aea-9727-4a7c-8e72-292263fb61a9",
+ "modelVersionId": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2",
+ "modelCustomizationId": "de9b7aea-9727-4a7c-8e72-292263fb61a9",
+ "modelUuid": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2",
+ "modelInvariantUuid": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c",
+ "modelInstanceName": "FCGI 0"
+ },
+ "requestInfo": {
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "source": "VID",
+ "instanceName": "FCGI",
+ "suppressRollback": false,
+ "requestorId": "us16807000"
+ },
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb",
+ "modelInfo": {
+ "modelInvariantId": "1469946d-d566-467e-867b-88b29f6cb6c7",
+ "modelType": "service",
+ "modelName": "FCGI_5G_NC",
+ "modelVersion": "1.0",
+ "modelVersionId": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1",
+ "modelUuid": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1",
+ "modelInvariantUuid": "1469946d-d566-467e-867b-88b29f6cb6c7"
+ }
+ }
+ }
+ ],
+ "cloudConfiguration": {
+ "tenantId": "460f35aeb53542dc9f77105066483e83",
+ "cloudOwner": "att-aic",
+ "lcpCloudRegionId": "rdm5b"
+ },
+ "requestParameters": {},
+ "platform": {
+ "platformName": "plat1"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "ECOMP"
+ }
+ },
+ "instanceReferences": {
+ "serviceInstanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb",
+ "vnfInstanceId": "2f668980-7dbc-4231-a67c-8b69cd266b3a",
+ "vnfInstanceName": "FCGI",
+ "requestorId": "us16807000"
+ },
+ "requestStatus": {
+ "requestState": "COMPLETE",
+ "statusMessage": "STATUS: Vnf has been created successfully.",
+ "percentProgress": 100,
+ "finishTime": "Mon, 05 Nov 2018 09:22:45 GMT"
+ }
+ }
+ }, {
+ "request": {
+ "requestId": "6d7a4f7f-6502-4f63-b00a-de5bf33e64dd",
+ "startTime": "Mon, 05 Nov 2018 09:22:49 GMT",
+ "requestScope": "vfModule",
+ "requestType": "createInstance",
+ "requestDetails": {
+ "modelInfo": {
+ "modelCustomizationName": "Fcgi..base_cgi..module-0",
+ "modelInvariantId": "eede8ca2-bbeb-441a-a42e-4a3ecc8449a1",
+ "modelType": "vfModule",
+ "modelName": "Fcgi..base_cgi..module-0",
+ "modelVersion": "1",
+ "modelCustomizationUuid": "acf03fbb-eee4-4f86-9e99-249841f3e9cb",
+ "modelVersionId": "38bcccc5-5902-4831-bf6d-5cd197ec6ad6",
+ "modelCustomizationId": "acf03fbb-eee4-4f86-9e99-249841f3e9cb",
+ "modelUuid": "38bcccc5-5902-4831-bf6d-5cd197ec6ad6",
+ "modelInvariantUuid": "eede8ca2-bbeb-441a-a42e-4a3ecc8449a1",
+ "modelInstanceName": "Fcgi..base_cgi..module-0"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "instanceName": "murkav",
+ "suppressRollback": true,
+ "requestorId": "us16807000"
+ },
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb",
+ "modelInfo": {
+ "modelInvariantId": "1469946d-d566-467e-867b-88b29f6cb6c7",
+ "modelType": "service",
+ "modelName": "FCGI_5G_NC",
+ "modelVersion": "1.0",
+ "modelVersionId": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1",
+ "modelUuid": "ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1",
+ "modelInvariantUuid": "1469946d-d566-467e-867b-88b29f6cb6c7"
+ }
+ }
+ }, {
+ "relatedInstance": {
+ "instanceId": "2f668980-7dbc-4231-a67c-8b69cd266b3a",
+ "modelInfo": {
+ "modelCustomizationName": "FCGI 0",
+ "modelInvariantId": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c",
+ "modelType": "vnf",
+ "modelName": "FCGI",
+ "modelVersion": "1.0",
+ "modelCustomizationUuid": "de9b7aea-9727-4a7c-8e72-292263fb61a9",
+ "modelVersionId": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2",
+ "modelCustomizationId": "de9b7aea-9727-4a7c-8e72-292263fb61a9",
+ "modelUuid": "0d23f7bc-eee4-4151-9fb9-37f5bea834c2",
+ "modelInvariantUuid": "ba2ee320-23ce-4d2e-94dd-1ec450cec62c",
+ "modelInstanceName": "FCGI 0"
+ }
+ }
+ }
+ ],
+ "cloudConfiguration": {
+ "tenantId": "460f35aeb53542dc9f77105066483e83",
+ "cloudOwner": "att-aic",
+ "lcpCloudRegionId": "rdm5b"
+ },
+ "requestParameters": {
+ "usePreload": false
+ }
+ },
+ "instanceReferences": {
+ "serviceInstanceId": "f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb",
+ "vnfInstanceId": "2f668980-7dbc-4231-a67c-8b69cd266b3a",
+ "vfModuleInstanceId": "227dae7e-622d-4841-b664-9bbade0ac0c8",
+ "vfModuleInstanceName": "murkav",
+ "requestorId": "us16807000"
+ },
+ "requestStatus": {
+ "requestState": "IN_PROGRESS"
+ }
+ }
+ }
+ ]
+}
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json
new file mode 100644
index 000000000..55a57e195
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_deletion_request.json
@@ -0,0 +1,19 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+ "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+ "modelName": "MOW AVPN vMX BV vPE 1 Service",
+ "modelVersion": "10.0"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "testApi": "VNF_API",
+ "aLaCarte": true
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json
new file mode 100644
index 000000000..955685268
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request.json
@@ -0,0 +1,34 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+ "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+ "modelName": "MOW AVPN vMX BV vPE 1 Service",
+ "modelVersion": "10.0"
+ },
+ "owningEntity": {
+ "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+ "owningEntityName": "PACKET CORE"
+ },
+ "project": {
+ "projectName": "{some project name}"
+ },
+ "subscriberInfo": {
+ "globalSubscriberId": "{some subscriber id}"
+ },
+ "requestInfo": {
+ "instanceName": "vPE_Service",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "testApi": "VNF_API",
+ "subscriptionServiceType": "VMX",
+ "aLaCarte": true,
+ "userParams": []
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json
new file mode 100644
index 000000000..be697ed88
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_alacarte_service_request_naming_false.json
@@ -0,0 +1,32 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelInvariantId": "5d48acb5-097d-4982-aeb2-f4a3bd87d31b",
+ "modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a",
+ "modelName": "MOW AVPN vMX BV vPE 1 Service",
+ "modelType": "service",
+ "modelVersion": "10.0"
+ },
+ "owningEntity": {
+ "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+ "owningEntityName": "PACKET CORE"
+ },
+ "subscriberInfo": {
+ "globalSubscriberId": "{some subscriber id}"
+ },
+ "project": {
+ "projectName": "{some project name}"
+ },
+ "requestInfo": {
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": false,
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "subscriptionServiceType": "VMX",
+ "aLaCarte": true,
+ "userParams": []
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json
index 27a4abbdb..917900c22 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_macro_service_request.json
@@ -15,6 +15,7 @@
"projectName": "{some project name}"
},
"subscriberInfo": {
+ "subscriberName" : "{some subscriber name}",
"globalSubscriberId": "{some subscriber id}"
},
"requestInfo": {
@@ -50,6 +51,7 @@
},
"cloudConfiguration": {
"lcpCloudRegionId": "mdt1",
+ "cloudOwner": "att-aic",
"tenantId": "88a6ca3ee0394ade9403f075db23167e"
},
"platform": {
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
index 59e546774..55765a86b 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_ecomp_naming.json
@@ -48,6 +48,7 @@
},
"cloudConfiguration": {
"lcpCloudRegionId": "mdt1",
+ "cloudOwner": "att-aic",
"tenantId": "88a6ca3ee0394ade9403f075db23167e"
},
"platform": {
@@ -57,9 +58,14 @@
"lineOfBusinessName": "lineOfBusinessName"
},
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "instanceParams": [],
+ "instanceParams": [{
+ "vmx_int_net_len": "24",
+ "availability_zone_0": "mtpocdv-kvm-az01",
+ "vre_a_volume_size_0": "100"
+ }],
"vfModules": [{
"modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
"modelType": "vfModule",
"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
@@ -71,6 +77,7 @@
},
{
"modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
"modelType": "vfModule",
"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
index d1af5ab1a..fdc81511c 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_no_vfmodule_ecomp_naming.json
@@ -48,6 +48,7 @@
},
"cloudConfiguration": {
"lcpCloudRegionId": "mdt1",
+ "cloudOwner": "att-aic",
"tenantId": "88a6ca3ee0394ade9403f075db23167e"
},
"platform": {
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
index 314c3bb7e..643c1043a 100644
--- a/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_service_request_unique_names.json
@@ -18,7 +18,7 @@
"globalSubscriberId": "{some subscriber id}"
},
"requestInfo": {
- "instanceName": "vPE_Service_{SERVICE_UNIQENESS}",
+ "instanceName": "vPE_Service{SERVICE_UNIQENESS}",
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
"source": "VID",
"suppressRollback": true,
@@ -34,7 +34,7 @@
"modelName": "MOW AVPN vMX BV vPE 1 Service",
"modelVersionId": "3c40d244-808e-42ca-b09a-256d83d19d0a"
},
- "instanceName": "vPE_Service_{SERVICE_UNIQENESS}",
+ "instanceName": "vPE_Service{SERVICE_UNIQENESS}",
"instanceParams": [{
"instanceParams_test1": "some text",
"instanceParams_test2": "another text"
@@ -50,6 +50,7 @@
},
"cloudConfiguration": {
"lcpCloudRegionId": "mdt1",
+ "cloudOwner": "att-aic",
"tenantId": "88a6ca3ee0394ade9403f075db23167e"
},
"platform": {
@@ -59,29 +60,35 @@
"lineOfBusinessName": "lineOfBusinessName"
},
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "instanceName": "vmxnjr001_{VNF_UNIQENESS}",
- "instanceParams": [],
+ "instanceName": "vmxnjr001{VNF_UNIQENESS}",
+ "instanceParams": [{
+ "vmx_int_net_len": "24",
+ "availability_zone_0": "mtpocdv-kvm-az01",
+ "vre_a_volume_size_0": "100"
+ }],
"vfModules": [{
"modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
"modelType": "vfModule",
"modelName": "201673MowAvpnVpeBvL..AVPN_base_vPE_BV..module-0",
"modelVersionId": "4c75f813-fa91-45a4-89d0-790ff5f1ae79",
"modelCustomizationId": "a25e8e8c-58b8-4eec-810c-97dcc1f5cb7f"
},
- "instanceName": "vmxnjr001_AVPN_base_vPE_BV_base_{VF_MODULE_UNIQENESS}",
+ "instanceName": "vmxnjr001_AVPN_base_vPE_BV_base{VF_MODULE_UNIQENESS}",
"instanceParams": [{
"vmx_int_net_len": "24"
}]
},
{
"modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
"modelType": "vfModule",
"modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
"modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
"modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8"
},
- "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion_{VF_MODULE_2_UNIQENESS}",
- "volumeGroupInstanceName" : "myVgName_{VG_UNIQUENESS}",
+ "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion{VF_MODULE_2_UNIQENESS}",
+ "volumeGroupInstanceName" : "myVgName{VG_UNIQUENESS}",
"instanceParams": [{
"availability_zone_0": "mtpocdv-kvm-az01",
"vre_a_volume_size_0": "100"
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json
new file mode 100644
index 000000000..d7b6d8629
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request.json
@@ -0,0 +1,48 @@
+ {
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "instanceName": "vmxnjr001_001",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "platform": {
+ "platformName": "platformName"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "lineOfBusinessName"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+ } \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json
new file mode 100644
index 000000000..00f224e9e
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_cloud_owner.json
@@ -0,0 +1,47 @@
+ {
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "instanceName": "vmxnjr001_001",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "platform": {
+ "platformName": "platformName"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "lineOfBusinessName"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+ } \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json
new file mode 100644
index 000000000..9921de59b
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/bulk_vnf_request_without_instance_name.json
@@ -0,0 +1,47 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner": "att-aic"
+ },
+ "requestInfo": {
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "platform": {
+ "platformName": "platformName"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "lineOfBusinessName"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json
new file mode 100644
index 000000000..7072d3213
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/instance_group_instantiation_request.json
@@ -0,0 +1,36 @@
+ {
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ },
+ "requestInfo": {
+ "instanceName": "VNF_GROUP_NAME_001",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "az2018"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+ } \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json
new file mode 100644
index 000000000..5a722ac4c
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request.json
@@ -0,0 +1,48 @@
+ {
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "network",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "instanceName": "vmxnjr001_001",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "platform": {
+ "platformName": "platformName"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "lineOfBusinessName"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+ } \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json
new file mode 100644
index 000000000..db55736c4
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/network_instantiation_request_without_instance_name.json
@@ -0,0 +1,47 @@
+ {
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "network",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "platform": {
+ "platformName": "platformName"
+ },
+ "lineOfBusiness": {
+ "lineOfBusinessName": "lineOfBusinessName"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+ } \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
index c509c6247..b846d50c3 100644
--- a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
+++ b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayload.json
@@ -10,8 +10,7 @@
"modelInvariantId": "c9817f08-07b2-458b-a02f-cd5407ee7a7b",
"modelVersionId": "0e0bb964-e687-4439-9a9e-de9cd1ff5367",
"modelName": "ws-service",
- "modelVersion": "1.0",
- "additionalProperties": {}
+ "modelVersion": "1.0"
}
}
},
@@ -25,16 +24,14 @@
"modelName": "ws-sp",
"modelVersion": "1.0",
"modelCustomizationName": "ws-sp 0",
- "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986",
- "additionalProperties": {}
+ "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986"
}
}
}
],
"cloudConfiguration": {
"lcpCloudRegionId": "RegionOne",
- "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e",
- "additionalProperties": {}
+ "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e"
},
"modelInfo": {
"modelCustomizationName": "WsSp..base_ws..module-0",
@@ -44,18 +41,15 @@
"modelName": "WsSp..base_ws..module-0",
"modelNameVersionId": null,
"modelType": "vfModule",
- "modelVersion": "1",
- "additionalProperties": {}
+ "modelVersion": "1"
},
"requestInfo": {
"instanceName": "ws-test-0310-8_NaN",
"source": "VID",
"suppressRollback": false,
- "requestorId": "demo",
- "additionalProperties": {}
+ "requestorId": "demo"
},
"requestParameters": {
- "additionalProperties": {}
},
"configurationParameters": [
{
@@ -63,5 +57,4 @@
"xtz-123": "$.vnf-topology.vnf-resource-assignments.availability-zones.availability-zone[0]"
}
]
- }
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
index ddbebac95..d46db77fd 100644
--- a/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
+++ b/vid-app-common/src/test/resources/payload_jsons/scaleOutVfModulePayloadToMso.json
@@ -9,8 +9,7 @@
"modelInvariantId": "c9817f08-07b2-458b-a02f-cd5407ee7a7b",
"modelVersionId": "0e0bb964-e687-4439-9a9e-de9cd1ff5367",
"modelName": "ws-service",
- "modelVersion": "1.0",
- "additionalProperties": {}
+ "modelVersion": "1.0"
}
}
},
@@ -24,16 +23,14 @@
"modelName": "ws-sp",
"modelVersion": "1.0",
"modelCustomizationName": "ws-sp 0",
- "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986",
- "additionalProperties": {}
+ "modelCustomizationId": "5815868c-35f8-4c5a-b899-e6eb49f52986"
}
}
}
],
"cloudConfiguration": {
"lcpCloudRegionId": "RegionOne",
- "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e",
- "additionalProperties": {}
+ "tenantId": "1e097c6713e74fd7ac8e4295e605ee1e"
},
"modelInfo": {
"modelCustomizationName": "WsSp..base_ws..module-0",
@@ -43,18 +40,15 @@
"modelName": "WsSp..base_ws..module-0",
"modelNameVersionId": null,
"modelType": "vfModule",
- "modelVersion": "1",
- "additionalProperties": {}
+ "modelVersion": "1"
},
"requestInfo": {
"instanceName": "ws-test-0310-8_NaN",
"source": "VID",
"suppressRollback": false,
- "requestorId": "demo",
- "additionalProperties": {}
+ "requestorId": "demo"
},
"requestParameters": {
- "additionalProperties": {}
},
"configurationParameters": [
{
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json b/vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json
new file mode 100644
index 000000000..d86ad1966
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfModuleDeactivateAndCloudDelete.json
@@ -0,0 +1,17 @@
+{
+ "modelInfo": {
+ "modelType": "vfModule"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "requestParameters" : {
+ "testApi" : "GR_API",
+ "userParams": []
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json
new file mode 100644
index 000000000..92f837faf
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request.json
@@ -0,0 +1,69 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelType": "vfModule",
+ "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+ "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+ "modelInvariantId": "22222222-f63c-463e-ba94-286933b895f9",
+ "modelVersion": "10.0"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "bb3514e3-5a33-55df-13ab-12abad84e7bb",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "cc3514e3-5a33-55df-13ab-12abad84e7cc",
+ "instanceName": "myVgName",
+ "modelInfo": {
+ "modelType": "volumeGroup"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "usePreload": true,
+ "userParams": [{
+ "vre_a_volume_size_0" : "100",
+ "vmx_int_net_len" : "24",
+ "availability_zone_0": "mtpocdv-kvm-az01"
+ }]
+ }
+ }
+}
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json
new file mode 100644
index 000000000..82df5b90a
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_instance_name.json
@@ -0,0 +1,59 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelType": "vfModule",
+ "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+ "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+ "modelInvariantId": "22222222-f63c-463e-ba94-286933b895f9",
+ "modelVersion": "10.0"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "bb3514e3-5a33-55df-13ab-12abad84e7bb",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "usePreload": true,
+ "userParams": [{
+ "vre_a_volume_size_0" : "100",
+ "vmx_int_net_len" : "24",
+ "availability_zone_0": "mtpocdv-kvm-az01"
+ }]
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json
new file mode 100644
index 000000000..cfa4c2652
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule_instantiation_request_without_volume_group.json
@@ -0,0 +1,60 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelType": "vfModule",
+ "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+ "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+ "modelInvariantId": "22222222-f63c-463e-ba94-286933b895f9",
+ "modelVersion": "10.0"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "instanceName": "vmxnjr001_AVPN_base_vRE_BV_expansion",
+ "source": "VID",
+ "suppressRollback": true,
+ "requestorId": "pa0916"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "aa3514e3-5a33-55df-13ab-12abad84e7aa",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "bb3514e3-5a33-55df-13ab-12abad84e7bb",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "usePreload": true,
+ "userParams": [{
+ "vre_a_volume_size_0" : "100",
+ "vmx_int_net_len" : "24",
+ "availability_zone_0": "mtpocdv-kvm-az01"
+ }]
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json
new file mode 100644
index 000000000..02d2d1e14
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/volumegroup_instantiation_request.json
@@ -0,0 +1,56 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "volumeGroup",
+ "modelCustomizationName" : "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelInvariantId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "56e2b103-637c-4d1a-adc8-3a7f4a6c3240",
+ "modelCustomizationId": "72d9d1cd-f46d-447a-abdb-451d6fb05fa8",
+ "modelName": "201673MowAvpnVpeBvL..AVPN_vRE_BV..module-1",
+ "modelVersion": "1"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "cloudOwner" : "att-aic"
+ },
+ "requestInfo": {
+ "instanceName": "myVgName",
+ "source": "VID",
+ "requestorId": "az2016",
+ "suppressRollback": true
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "sriov",
+ "modelVersion": "1.0"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "vnfInstanceId",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "11111111-f63c-463e-ba94-286933b895f9",
+ "modelVersionId": "7f40c192-f63c-463e-ba94-286933b895f8",
+ "modelName": "2016-73_MOW-AVPN-vPE-BV-L",
+ "modelVersion": "10.0",
+ "modelCustomizationName": "2016-73_MOW-AVPN-vPE-BV-L 0",
+ "modelCustomizationId": "ab153b6e-c364-44c0-bef6-1f2982117f04"
+ }
+ }
+ }
+ ],
+ "requestParameters" : {
+ "userParams" : [ ],
+ "usePreload" : true
+ }
+ }
+}
diff --git a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
index 993cfb2ba..4508599bc 100644
--- a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
+++ b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
@@ -28,7 +28,8 @@
"collector_node": "pprobeservice_proxy 5",
"policy_name": "policy2",
"equip_vendor": "Cisco",
- "equip_model": "Nexus 3048-TP"
+ "equip_model": "Nexus 3048-TP",
+ "ecomp_generated_naming": "false"
},
"type": "Configuration",
"modelCustomizationName": "Port Mirroring Configuration By Policy 1",
@@ -54,7 +55,8 @@
"collector_node": "pprobeservice_proxy 4",
"policy_name": "policy1",
"equip_vendor": "Cisco",
- "equip_model": "Nexus 3048-TP"
+ "equip_model": "Nexus 3048-TP",
+ "ecomp_generated_naming": "false"
},
"type": "Configuration",
"modelCustomizationName": "Port Mirroring Configuration By Policy 0",
@@ -162,5 +164,6 @@
},
"vfModules": {},
"volumeGroups": {},
- "pnfs": {}
+ "pnfs": {},
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/policy-configuration-csar.JSON b/vid-app-common/src/test/resources/policy-configuration-csar.JSON
index 8e9b46e7a..41f5f5cbf 100644
--- a/vid-app-common/src/test/resources/policy-configuration-csar.JSON
+++ b/vid-app-common/src/test/resources/policy-configuration-csar.JSON
@@ -28,7 +28,8 @@
"collector_node": "pprobeservice_proxy 5",
"policy_name": "policy2",
"equip_vendor": "Cisco",
- "equip_model": "Nexus 3048-TP"
+ "equip_model": "Nexus 3048-TP",
+ "ecomp_generated_naming": "false"
},
"type": "Configuration",
"modelCustomizationName": "Port Mirroring Configuration By Policy 1",
@@ -55,7 +56,8 @@
"collector_node": "pprobeservice_proxy 4",
"policy_name": "policy1",
"equip_vendor": "Cisco",
- "equip_model": "Nexus 3048-TP"
+ "equip_model": "Nexus 3048-TP",
+ "ecomp_generated_naming": "false"
},
"type": "Configuration",
"modelCustomizationName": "Port Mirroring Configuration By Policy 0",
@@ -80,7 +82,9 @@
"customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17",
"inputs": {},
"commands": {},
- "properties": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
"type": "Service Proxy",
"sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
"sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
@@ -95,7 +99,9 @@
"customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb",
"inputs": {},
"commands": {},
- "properties": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
"type": "Service Proxy",
"sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
"sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
@@ -110,7 +116,9 @@
"customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a",
"inputs": {},
"commands": {},
- "properties": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
"type": "Service Proxy",
"sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
"sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
@@ -125,7 +133,9 @@
"customizationUuid": "271efa3b-276e-4536-976a-cc9c9c014f1e",
"inputs": {},
"commands": {},
- "properties": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
"type": "Service Proxy",
"sourceModelUuid": "8a84e59b-45fe-4851-8ff1-34225a0b32c3",
"sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911",
@@ -140,7 +150,9 @@
"customizationUuid": "d64623ae-5935-4afd-803e-c86e94d8e740",
"inputs": {},
"commands": {},
- "properties": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
"type": "Service Proxy",
"sourceModelUuid": "8a84e59b-45fe-4851-8ff1-34225a0b32c3",
"sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911",
@@ -155,7 +167,9 @@
"customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17",
"inputs": {},
"commands": {},
- "properties": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
"type": "Service Proxy",
"sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
"sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
@@ -164,5 +178,6 @@
},
"vfModules": {},
"volumeGroups": {},
- "pnfs": {}
+ "pnfs": {},
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json b/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json
new file mode 100644
index 000000000..690be607b
--- /dev/null
+++ b/vid-app-common/src/test/resources/responses/aai/getCloudRegionAndTenantByVnfId.json
@@ -0,0 +1,119 @@
+{
+ "results": [
+ {
+ "id": "363687968",
+ "node-type": "generic-vnf",
+ "url": "/aai/v14/network/generic-vnfs/generic-vnf/4ac51f60-ae58-49c0-a308-f0c2dd0261cf",
+ "properties": {
+ "vnf-id": "4ac51f60-ae58-49c0-a308-f0c2dd0261cf",
+ "vnf-name": "zmtn23bmogx05_oam_01_rk",
+ "vnf-type": "vMOG_SVC_UPDATED_FLAV_OAM/vMOG_VSP_UPDATED_FLAV 0",
+ "service-id": "db171b8f-115c-4992-a2e3-ee04cae357e0",
+ "prov-status": "NVTPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1522780608709",
+ "model-invariant-id": "5108d7e4-f32a-44cd-8835-433a70915b8c",
+ "model-version-id": "bae37933-b694-4b4e-a734-db63416f9cfe",
+ "model-customization-id": "732305c6-d36a-47ee-a701-6f28f87b90cd",
+ "nf-type": "POLICY",
+ "nf-function": "Mobility Orchestration Gateway (MOG)",
+ "nf-role": "vMOG",
+ "nf-naming-code": ""
+ },
+ "related-to": [
+ {
+ "id": "193753168",
+ "relationship-label": "org.onap.relationships.inventory.ComposedOf",
+ "node-type": "service-instance",
+ "url": "/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/7f10ffe2-548f-4168-8722-b782d05675b7"
+ }
+ ]
+ },
+ {
+ "id": "264798392",
+ "node-type": "vserver",
+ "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84",
+ "properties": {
+ "vserver-id": "088c2bf0-80e2-4bdf-93ae-b2469fbeba84",
+ "vserver-name": "zrdm3mogx01oam001",
+ "vserver-name2": "zrdm3mogx01oam001",
+ "vserver-selflink": "https://compute-aic.mtn23b.cci.att.com:8774/v2/3e9a20a3e89e45f884e09df0cc2d2d2a/servers/088c2bf0-80e2-4bdf-93ae-b2469fbeba84",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1522719699848"
+ },
+ "related-to": [
+ {
+ "id": "211808464",
+ "relationship-label": "tosca.relationships.AttachesTo",
+ "node-type": "volume",
+ "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84/volumes/volume/28e1246e-2aeb-4a59-bb51-f20fb8e93c42"
+ }
+ ]
+ },
+ {
+ "id": "67158224",
+ "node-type": "pserver",
+ "url": "/aai/v14/cloud-infrastructure/pservers/pserver/mtn23br21c009.mtn23b.cci.att.com",
+ "properties": {
+ "hostname": "mtn23br21c009.mtn23b.cci.att.com",
+ "pserver-id": "auto-generated-skeleton",
+ "in-maint": false,
+ "resource-version": "1538596103767"
+ },
+ "related-to": [
+ {
+ "id": "743800864",
+ "relationship-label": "org.onap.relationships.inventory.LocatedIn",
+ "node-type": "complex",
+ "url": "/aai/v14/cloud-infrastructure/complexes/complex/MDTWNJ21"
+ }
+ ]
+ },
+ {
+ "id": "8757432",
+ "node-type": "tenant",
+ "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "properties": {
+ "tenant-id": "3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenant-name": "APPC-24595-T-IST-02C",
+ "resource-version": "1539855222745"
+ },
+ "related-to": [
+ {
+ "id": "760360992",
+ "relationship-label": "org.onap.relationships.inventory.Uses",
+ "node-type": "l3-network",
+ "url": "/aai/v14/network/l3-networks/l3-network/1fea0624-dac2-4997-904d-34ca1bc12fa9"
+ }
+ ]
+ },
+ {
+ "id": "302227536",
+ "node-type": "cloud-region",
+ "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b",
+ "properties": {
+ "cloud-owner": "att-aic",
+ "cloud-region-id": "mtn23b",
+ "cloud-type": "openstack",
+ "owner-defined-type": "lcp",
+ "cloud-region-version": "3.0",
+ "identity-url": "https://identity-aic.mtn23b.cci.att.com:5000/v2.0",
+ "cloud-zone": "z1",
+ "complex-name": "c1",
+ "sriov-automation": "false",
+ "resource-version": "1539855222969"
+ },
+ "related-to": [
+ {
+ "id": "2744328",
+ "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+ "node-type": "tenant",
+ "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/5452d6bd0cb34e99a3553d349456c642"
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json
new file mode 100644
index 000000000..9af4b2aeb
--- /dev/null
+++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsMockedMinimalResponse.json
@@ -0,0 +1,11 @@
+{
+ "request": {
+ "requestId": "d8bbd676-4067-431f-9a5d-9843f5c199cf",
+ "requestStatus": {
+ "requestState": "COMPLETE",
+ "statusMessage": "Vnf has been created successfully.",
+ "percentProgress": 100,
+ "finishTime": "Mon, 11 Jun 2018 12:38:56 GMT"
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json
new file mode 100644
index 000000000..640fb2b56
--- /dev/null
+++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsServiceInstance.json
@@ -0,0 +1,19 @@
+{
+ "request": {
+ "requestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c",
+ "startTime": "Mon, 11 Dec 2017 07:27:49 GMT",
+ "requestScope": "service",
+ "requestType": "createInstance",
+ "instanceReferences": {
+ "serviceInstanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "serviceInstanceName": "asdfasdf234234asdf",
+ "requestorId": "il883e"
+ },
+ "requestStatus": {
+ "requestState": "COMPLETE",
+ "statusMessage": "Service Instance was created successfully.",
+ "percentProgress": 100,
+ "finishTime": "Mon, 11 Dec 2017 07:27:53 GMT"
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json
new file mode 100644
index 000000000..f83310427
--- /dev/null
+++ b/vid-app-common/src/test/resources/responses/mso/orchestrationRequestsVnf.json
@@ -0,0 +1,68 @@
+{
+ "request": {
+ "requestId": "d8bbd676-4067-431f-9a5d-9843f5c199cf",
+ "startTime": "Mon, 11 Jun 2018 12:38:50 GMT",
+ "requestScope": "vnf",
+ "requestType": "createInstance",
+ "requestDetails": {
+ "modelInfo": {
+ "modelCustomizationName": "2016-233_XSP_bfsa_nin2 0",
+ "modelInvariantId": "74dc0354-a178-43ee-91f2-ec1f288cd50d",
+ "modelType": "vnf",
+ "modelName": "2016-233_XSP_bfsa_nin2",
+ "modelVersion": "1.0",
+ "modelCustomizationUuid": "fc1add68-90c4-4ed1-ac92-b8df3087fb01",
+ "modelVersionId": "327138f7-0608-4774-bb2c-959332a18399",
+ "modelCustomizationId": "fc1add68-90c4-4ed1-ac92-b8df3087fb01",
+ "modelUuid": "327138f7-0608-4774-bb2c-959332a18399",
+ "modelInvariantUuid": "74dc0354-a178-43ee-91f2-ec1f288cd50d",
+ "modelInstanceName": "2016-233_XSP_bfsa_nin2 0"
+ },
+ "requestInfo": {
+ "productFamilyId": "vHNPaas",
+ "source": "VID",
+ "instanceName": "VNF_TestaLaCarte",
+ "suppressRollback": false,
+ "requestorId": "lz230u"
+ },
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "dc7f4414-97ab-4055-8267-9f2dfb10f0a8",
+ "modelInfo": {
+ "modelInvariantId": "11256e47-66c8-4749-a30c-15fdcd1cc014",
+ "modelType": "service",
+ "modelName": "Dror_service1806_a_la_carte_NW",
+ "modelVersion": "1.0",
+ "modelVersionId": "88ad0fe5-56d5-4435-aaee-da5c707878df",
+ "modelUuid": "88ad0fe5-56d5-4435-aaee-da5c707878df",
+ "modelInvariantUuid": "11256e47-66c8-4749-a30c-15fdcd1cc014"
+ }
+ }
+ }
+ ],
+ "cloudConfiguration": {
+ "tenantId": "19dfa99ba1cc4948bb868eba9e0de7ab",
+ "cloudOwner": "att-aic",
+ "lcpCloudRegionId": "test1"
+ },
+ "requestParameters": {
+ "testApi": "VNF_API"
+ },
+ "platform": {
+ "platformName": "RADIO-WIRELESSENGINEERING"
+ }
+ },
+ "instanceReferences": {
+ "serviceInstanceId": "dc7f4414-97ab-4055-8267-9f2dfb10f0a8",
+ "vnfInstanceId": "cfeabd66-f9ac-4204-9732-157b091fe4f8",
+ "vnfInstanceName": "VNF_TestaLaCarte",
+ "requestorId": "lz230u"
+ },
+ "requestStatus": {
+ "requestState": "COMPLETE",
+ "statusMessage": "Vnf has been created successfully.",
+ "percentProgress": 100,
+ "finishTime": "Mon, 11 Jun 2018 12:38:56 GMT"
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vf-csar.JSON b/vid-app-common/src/test/resources/vf-csar.JSON
index 48c3f7dd7..c1b71b34f 100644
--- a/vid-app-common/src/test/resources/vf-csar.JSON
+++ b/vid-app-common/src/test/resources/vf-csar.JSON
@@ -100,7 +100,8 @@
"itc_name_0": "get_input:greatdefect0_itc_name_0",
"itm_flavor_name": "nv.c2r4d50",
"itm_image_name": "NIMBUS_IXLA-ITM_8.20.EA_KVM.qcow2",
- "vf_module_id": "get_input:greatdefect0_vf_module_id"
+ "vf_module_id": "get_input:greatdefect0_vf_module_id",
+ "ecomp_generated_naming": "false"
},
"type": "VF",
"modelCustomizationName": "greatdefect 0",
@@ -117,7 +118,8 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": null
+ "vfModuleLabel": null,
+ "baseModule" : false
},
"inputs": {
@@ -136,7 +138,8 @@
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": null
+ "vfModuleLabel": null,
+ "baseModule" : true
},
"inputs": {
@@ -174,5 +177,6 @@
},
"pnfs": {
- }
+ },
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vf-with-annotation-csar.json b/vid-app-common/src/test/resources/vf-with-annotation-csar.json
index 12b53b14a..db68313f1 100644
--- a/vid-app-common/src/test/resources/vf-with-annotation-csar.json
+++ b/vid-app-common/src/test/resources/vf-with-annotation-csar.json
@@ -122,7 +122,8 @@
"nf_role": "vPE",
"vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
"vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
- "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
+ "vmxvpfe_flavor_name": "ns.c20r16d25.v5",
+ "ecomp_generated_naming": "true"
},
"type": "VF",
"modelCustomizationName": "2017-488_ADIOD-vPE 0",
@@ -139,10 +140,12 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV"
+ "vfModuleLabel": "ADIOD_vRE_BV",
+ "baseModule" : false
},
"inputs": {
- "2017488_adiodvpe0_bandwidth_units": {
+ "bandwidth_units": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth_units",
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
@@ -155,7 +158,8 @@
"required": true,
"default": "Gbps"
},
- "2017488_adiodvpe0_bandwidth": {
+ "bandwidth": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth",
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
@@ -168,7 +172,8 @@
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "vnf_instance_name": {
+ "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
@@ -181,7 +186,8 @@
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "vnf_config_template_version": {
+ "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
@@ -194,7 +200,8 @@
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "AIC_CLLI": {
+ "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
@@ -222,7 +229,8 @@
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "ADIOD_base_vPE_BV"
+ "vfModuleLabel": "ADIOD_base_vPE_BV",
+ "baseModule" : true
},
"inputs": {
@@ -241,10 +249,12 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV"
+ "vfModuleLabel": "ADIOD_vPFE_BV",
+ "baseModule" : false
},
"inputs": {
- "2017488_adiodvpe0_availability_zone_0": {
+ "availability_zone_0": {
+ "fromInputName": "2017488_adiodvpe0_availability_zone_0",
"type": "string",
"description": "The Availability Zone to launch the instance.",
"entry_schema": null,
@@ -277,7 +287,8 @@
"vfModuleLabel": "ADIOD_vRE_BV"
},
"inputs": {
- "2017488_adiodvpe0_bandwidth_units": {
+ "bandwidth_units": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth_units",
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
@@ -290,7 +301,8 @@
"required": true,
"default": "Gbps"
},
- "2017488_adiodvpe0_bandwidth": {
+ "bandwidth": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth",
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
@@ -303,7 +315,8 @@
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "vnf_instance_name": {
+ "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
@@ -316,7 +329,8 @@
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "vnf_config_template_version": {
+ "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
@@ -329,7 +343,8 @@
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "AIC_CLLI": {
+ "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
@@ -359,7 +374,8 @@
"vfModuleLabel": "ADIOD_vPFE_BV"
},
"inputs": {
- "2017488_adiodvpe0_availability_zone_0": {
+ "availability_zone_0": {
+ "fromInputName": "2017488_adiodvpe0_availability_zone_0",
"type": "string",
"description": "The Availability Zone to launch the instance.",
"entry_schema": null,
@@ -402,10 +418,12 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV"
+ "vfModuleLabel": "ADIOD_vRE_BV",
+ "baseModule" : false
},
"inputs": {
- "2017488_adiodvpe0_bandwidth_units": {
+ "bandwidth_units": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth_units",
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
@@ -418,7 +436,8 @@
"required": true,
"default": "Gbps"
},
- "2017488_adiodvpe0_bandwidth": {
+ "bandwidth": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth",
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
@@ -431,7 +450,8 @@
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "vnf_instance_name": {
+ "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
@@ -444,7 +464,8 @@
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "vnf_config_template_version": {
+ "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
@@ -457,7 +478,8 @@
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "AIC_CLLI": {
+ "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
@@ -485,7 +507,8 @@
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "ADIOD_base_vPE_BV"
+ "vfModuleLabel": "ADIOD_base_vPE_BV",
+ "baseModule" : true
},
"inputs": {
@@ -504,10 +527,12 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV"
+ "vfModuleLabel": "ADIOD_vPFE_BV",
+ "baseModule" : false
},
"inputs": {
- "2017488_adiodvpe0_availability_zone_0": {
+ "availability_zone_0": {
+ "fromInputName": "2017488_adiodvpe0_availability_zone_0",
"type": "string",
"description": "The Availability Zone to launch the instance.",
"entry_schema": null,
@@ -537,10 +562,12 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vRE_BV"
+ "vfModuleLabel": "ADIOD_vRE_BV",
+ "baseModule" : false
},
"inputs": {
- "2017488_adiodvpe0_bandwidth_units": {
+ "bandwidth_units": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth_units",
"type": "string",
"description": "Units of bandwidth",
"entry_schema": null,
@@ -553,7 +580,8 @@
"required": true,
"default": "Gbps"
},
- "2017488_adiodvpe0_bandwidth": {
+ "bandwidth": {
+ "fromInputName": "2017488_adiodvpe0_bandwidth",
"type": "string",
"description": "Requested VPE bandwidth",
"entry_schema": null,
@@ -566,7 +594,8 @@
"required": true,
"default": "10"
},
- "2017488_adiodvpe0_vnf_instance_name": {
+ "vnf_instance_name": {
+ "fromInputName": "2017488_adiodvpe0_vnf_instance_name",
"type": "string",
"description": "The hostname assigned to the vpe.",
"entry_schema": null,
@@ -579,7 +608,8 @@
"required": true,
"default": "mtnj309me6"
},
- "2017488_adiodvpe0_vnf_config_template_version": {
+ "vnf_config_template_version": {
+ "fromInputName": "2017488_adiodvpe0_vnf_config_template_version",
"type": "string",
"description": "VPE Software Version",
"entry_schema": null,
@@ -592,7 +622,8 @@
"required": true,
"default": "17.2"
},
- "2017488_adiodvpe0_AIC_CLLI": {
+ "AIC_CLLI": {
+ "fromInputName": "2017488_adiodvpe0_AIC_CLLI",
"type": "string",
"description": "AIC Site CLLI",
"entry_schema": null,
@@ -619,10 +650,12 @@
"minCountInstances": 0,
"maxCountInstances": null,
"initialCount": 0,
- "vfModuleLabel": "ADIOD_vPFE_BV"
+ "vfModuleLabel": "ADIOD_vPFE_BV",
+ "baseModule" : false
},
"inputs": {
- "2017488_adiodvpe0_availability_zone_0": {
+ "availability_zone_0": {
+ "fromInputName": "2017488_adiodvpe0_availability_zone_0",
"type": "string",
"description": "The Availability Zone to launch the instance.",
"entry_schema": null,
@@ -640,5 +673,6 @@
},
"pnfs": {
- }
+ },
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json b/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json
index ee3a1b4c2..3b7e2e854 100644
--- a/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json
+++ b/vid-app-common/src/test/resources/vf-with-vfcInstanceGroups.json
@@ -54,7 +54,8 @@
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "main"
+ "vfModuleLabel": "main",
+ "baseModule" : true
},
"inputs": {
@@ -118,7 +119,8 @@
"minCountInstances": 1,
"maxCountInstances": 1,
"initialCount": 1,
- "vfModuleLabel": "main"
+ "vfModuleLabel": "main",
+ "baseModule" : true
},
"inputs": {
@@ -131,5 +133,6 @@
},
"pnfs": {
- }
+ },
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vl-csar.JSON b/vid-app-common/src/test/resources/vl-csar.JSON
index 349d049f0..3de6ee460 100644
--- a/vid-app-common/src/test/resources/vl-csar.JSON
+++ b/vid-app-common/src/test/resources/vl-csar.JSON
@@ -66,8 +66,10 @@
},
"properties": {
"network_role": "get_input:extvl0_network_role",
- "exVL_naming": "{naming_policy=get_input:extvl0_exVL_naming_naming_policy}",
- "network_scope": "get_input:extvl0_network_scope"
+ "exVL_naming": "{naming_policy=get_input:extvl0_exVL_naming_naming_policy, ecomp_generated_naming=true}",
+ "network_scope": "get_input:extvl0_network_scope",
+ "ecomp_generated_naming": "true",
+ "network_technology": "Standard-SR-IOV"
},
"type": "VL",
"modelCustomizationName": "ExtVL 0"
@@ -90,5 +92,6 @@
},
"pnfs": {
- }
+ },
+ "vnfGroups": {}
} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vlan-tagging.json b/vid-app-common/src/test/resources/vlan-tagging.json
new file mode 100644
index 000000000..454327aa3
--- /dev/null
+++ b/vid-app-common/src/test/resources/vlan-tagging.json
@@ -0,0 +1,222 @@
+{
+ "service": {
+ "uuid": "1837481c-fa7d-4362-8ce1-d05fafc87bd1",
+ "invariantUuid": "93518289-3049-450f-a22d-86108c250265",
+ "name": "jenny vTSBC vlan SVC",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "INFRASTRUCTURE",
+ "serviceRole": "",
+ "description": "vlan tagging service for vTSBC",
+ "serviceEcompNaming": "true",
+ "instantiationType": "A-La-Carte",
+ "inputs": {}
+ },
+ "vnfs": {
+ "jenny vTSBC vlan VNF 0": {
+ "uuid": "28178f85-5cb1-4b2f-9424-987c2c113c75",
+ "invariantUuid": "cd560968-2ae7-4f49-8c4b-bb4ac1a4ca11",
+ "description": "vTSBC VNF used for vlan tagging and avpn bonding ",
+ "name": "jenny vTSBC vlan VNF",
+ "version": "3.0",
+ "customizationUuid": "171ab56f-6b53-45a0-a294-3cd326a04a66",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "nf_naming": "{ecomp_generated_naming=true}",
+ "multi_stage_design": "false",
+ "nf_naming_code": "tsbc",
+ "nf_function": "ACCESS-IP-FLEX-SBC",
+ "untrusted_avpn_vfc_instance_group_function": "SSCMSC VNFC Instance Group",
+ "rtp_msc_a_subint_untrusted_mis_port_0_net_ids": "[81]",
+ "availability_zone_max_count": "1",
+ "ssc_a_subint_untrusted_mis_port_0_net_ids": "[81]",
+ "ecomp_generated_naming": "true",
+ "nf_type": "SESSION-BORDER-CONTROLLER",
+ "perimeta_ssh_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXvSadEWp+nsz3gEAAAAAAAAAAbggQ3t06mqFIauHfUYMiKZ3EUX3jDFf/uGQoNsIZU6SNE/gl3tY4fFvO8Yzj8OY/vstHHvEadbY5aXNE6kd39ik20uRNbeZLT+pRllBwVKBSVnFqG3kBDvNWmBIenlPZzu3Ay0LYT/aDq6fZaz8Mqy8hzhpAAAAAAAAAAEmS/ESYY4UMs/aF2fVGmCLqudSjLpSsyD8lXag2dmeiT7cTdwRkgtDNTULXCPVucolVZwZF9BxXPNK++B+fL/ZY4MrXHXgZYGEElrMCFYkQFb3jQv3XQtxZ6gVByrzgGc9eiU7tkCgY2cVfb22iIs9n Generated-by-Nova",
+ "rtp_msc_b_subint_untrusted_mis_port_0_subintcount": "1.0",
+ "untrusted_avpn_network_collection_function": "vTSBC Customer Landing Network Collection",
+ "rtp_msc_b_subint_untrusted_mis_port_0_net_ids": "[81]",
+ "rtp_msc_a_subint_untrusted_mis_port_0_subintcount": "1.0",
+ "nf_role": "vACC-SBC",
+ "ssc_a_subint_untrusted_mis_port_0_subintcount": "1.0",
+ "ssc_b_subint_untrusted_mis_port_0_subintcount": "1.0",
+ "ssc_b_subint_untrusted_mis_port_0_net_ids": "[81]"
+ },
+ "type": "VF",
+ "modelCustomizationName": "jenny vTSBC vlan VNF 0",
+ "vfModules": {
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..module_2_perimeta_rtp_msc..module-1": {
+ "uuid": "79eaa54c-c712-40a6-89b9-03d336291905",
+ "invariantUuid": "eff0e0fd-67c5-4891-9382-d6959d761442",
+ "customizationUuid": "505c463c-b4a1-4f4a-9ea8-b50fd521db7e",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..module_2_perimeta_rtp_msc..module-1",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..module_2_perimeta_rtp_msc..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "module_2_perimeta_rtp_msc",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..module_1_perimeta_ssc_b..module-2": {
+ "uuid": "c14e5ad9-a838-4a82-8549-a1d38df20199",
+ "invariantUuid": "1c0e7c32-897c-454a-bb5d-42cc5e8f135c",
+ "customizationUuid": "25375811-6009-4f9e-b6fb-319eee74ddf1",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_b..module-2",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_b..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "module_1_perimeta_ssc_b",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..module_1_perimeta_ssc_a..module-3": {
+ "uuid": "81a6b0f9-e874-4a30-bd53-ced6745e5ca8",
+ "invariantUuid": "5a7f8d9c-e102-4556-9484-3a5be8020977",
+ "customizationUuid": "cf95f2d2-58db-4d56-b81e-08e7eadff525",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_a..module-3",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_a..module-3",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "module_1_perimeta_ssc_a",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..base_perimeta_deployment_create..module-0": {
+ "uuid": "24308202-1465-4bd8-99bd-e33895cbf18f",
+ "invariantUuid": "a141bf13-d817-4258-98d6-9f9d51fbe1c6",
+ "customizationUuid": "296f6b82-7a04-4faa-9835-e00088162533",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..base_perimeta_deployment_create..module-0",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..base_perimeta_deployment_create..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "base_perimeta_deployment_create",
+ "baseModule": true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ }
+ },
+ "volumeGroups": {},
+ "vfcInstanceGroups": {
+ "untrusted_avpn_group": {
+ "uuid": "1f45d67c-92af-45aa-b497-287e727177fb",
+ "invariantUuid": "e74d44d7-5bbe-4680-aa7f-ea9ace7ea79e",
+ "name": "untrusted_avpn_group",
+ "version": "1",
+ "vfcInstanceGroupProperties": {
+ "vfcParentPortRole": "unused",
+ "networkCollectionFunction": "vTSBC Customer Landing Network Collection",
+ "vfcInstanceGroupFunction": "SSCMSC VNFC Instance Group",
+ "subinterfaceRole": "untrusted_avpn"
+ }
+ }
+ }
+ }
+ },
+ "networks": {},
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..module_2_perimeta_rtp_msc..module-1": {
+ "uuid": "79eaa54c-c712-40a6-89b9-03d336291905",
+ "invariantUuid": "eff0e0fd-67c5-4891-9382-d6959d761442",
+ "customizationUuid": "505c463c-b4a1-4f4a-9ea8-b50fd521db7e",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..module_2_perimeta_rtp_msc..module-1",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..module_2_perimeta_rtp_msc..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "module_2_perimeta_rtp_msc",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..module_1_perimeta_ssc_a..module-3": {
+ "uuid": "81a6b0f9-e874-4a30-bd53-ced6745e5ca8",
+ "invariantUuid": "5a7f8d9c-e102-4556-9484-3a5be8020977",
+ "customizationUuid": "cf95f2d2-58db-4d56-b81e-08e7eadff525",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_a..module-3",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_a..module-3",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "module_1_perimeta_ssc_a",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..base_perimeta_deployment_create..module-0": {
+ "uuid": "24308202-1465-4bd8-99bd-e33895cbf18f",
+ "invariantUuid": "a141bf13-d817-4258-98d6-9f9d51fbe1c6",
+ "customizationUuid": "296f6b82-7a04-4faa-9835-e00088162533",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..base_perimeta_deployment_create..module-0",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..base_perimeta_deployment_create..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "base_perimeta_deployment_create",
+ "baseModule": true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "jennyvtsbcvlanvnf0..JennyVtsbcVlanVnf..module_1_perimeta_ssc_b..module-2": {
+ "uuid": "c14e5ad9-a838-4a82-8549-a1d38df20199",
+ "invariantUuid": "1c0e7c32-897c-454a-bb5d-42cc5e8f135c",
+ "customizationUuid": "25375811-6009-4f9e-b6fb-319eee74ddf1",
+ "description": null,
+ "name": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_b..module-2",
+ "version": "1",
+ "modelCustomizationName": "JennyVtsbcVlanVnf..module_1_perimeta_ssc_b..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "module_1_perimeta_ssc_b",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ }
+ },
+ "volumeGroups": {},
+ "pnfs": {},
+ "vnfGroups": {}
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vnf-grouping-csar.json b/vid-app-common/src/test/resources/vnf-grouping-csar.json
new file mode 100644
index 000000000..4c6f1d9c5
--- /dev/null
+++ b/vid-app-common/src/test/resources/vnf-grouping-csar.json
@@ -0,0 +1,145 @@
+{
+ "service": {
+ "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "name": "Grouping Service for Test",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L4+",
+ "serviceType": "INFRASTRUCTURE",
+ "serviceRole": "GROUPING",
+ "description": "xxx",
+ "serviceEcompNaming": "true",
+ "instantiationType": "A-La-Carte",
+ "inputs": {
+ }
+ },
+ "vnfs": {
+ },
+ "networks": {
+ },
+ "collectionResource": {
+ },
+ "configurations": {
+ },
+ "fabricConfigurations": {
+ },
+ "serviceProxies": {
+ "vdbe_svc_vprs_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service vDBE_Svc_vPRS",
+ "name": "vDBE_Svc_vPRS Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
+ "inputs": {
+ },
+ "commands": {
+ },
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
+ "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
+ "sourceModelName": "vDBE_Svc_vPRS"
+ },
+ "tsbc0001vm001_svc_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service tsbc0001vm001_Svc",
+ "name": "tsbc0001vm001_Svc Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead",
+ "inputs": {
+ },
+ "commands": {
+ },
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309",
+ "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047",
+ "sourceModelName": "tsbc0001vm001_Svc"
+ }
+ },
+ "vfModules": {
+ },
+ "volumeGroups": {
+ },
+ "pnfs": {
+ },
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "type": "VnfGroup",
+ "invariantUuid": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "version": "1",
+ "name": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "properties": {
+ "contained_resource_type": "VF",
+ "role": "SERVICE-ACCESS",
+ "function": "DATA",
+ "description": "DDD0",
+ "type": "LOAD-GROUP",
+ "ecomp_generated_naming": "true"
+ },
+ "members": {
+ "vdbe_svc_vprs_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service vDBE_Svc_vPRS",
+ "name": "vDBE_Svc_vPRS Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
+ "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
+ "sourceModelName": "vDBE_Svc_vPRS"
+ }
+ }
+ },
+ "groupingservicefortest..ResourceInstanceGroup..1": {
+ "type": "VnfGroup",
+ "invariantUuid": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a",
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "version": "1",
+ "name": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "properties": {
+ "contained_resource_type": "VF",
+ "role": "SERVICE-ACCESS",
+ "function": "SIGNALING",
+ "description": "DDD1",
+ "type": "LOAD-GROUP",
+ "ecomp_generated_naming": "true"
+ },
+ "members": {
+ "tsbc0001vm001_svc_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service tsbc0001vm001_Svc",
+ "name": "tsbc0001vm001_Svc Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309",
+ "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047",
+ "sourceModelName": "tsbc0001vm001_Svc"
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json b/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json
index cb2bf307c..1b5ad22f0 100644
--- a/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json
+++ b/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json
@@ -5,7 +5,7 @@
{
"vnfc":[
{
- "ipaddress-v4-oam-vip":"135.21.166.39",
+ "ipaddress-v4-oam-vip":"10.2.3.4",
"vnfc-name":"ibcx0001vm001dbg001",
"vnfc-function-code":"dbg",
"vnfc-type":"DBE-VM #1",