diff options
Diffstat (limited to 'ms/gra/gra-app/src/test')
23 files changed, 1961 insertions, 882 deletions
diff --git a/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java index 95226f7..8c311fb 100644 --- a/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java +++ b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java @@ -131,7 +131,7 @@ public class ConfigApiPreloadControllerTest { // Clean up data configPreloadDataRepository.deleteAll(); - String content = readFileContent("src/test/resources/preload1-net-model-info.json"); + String content = readFileContent("src/test/resources/preload1-net-list-item.json"); MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.post(CONFIG_PRELOAD_LIST_URL).contentType(MediaType.APPLICATION_JSON).content(content)) .andReturn(); @@ -220,17 +220,11 @@ public class ConfigApiPreloadControllerTest { // Clean up data configPreloadDataRepository.deleteAll(); - String badContent = readFileContent("src/test/resources/preload1-net-model-info.json"); String goodContent = readFileContent("src/test/resources/preload1-net-list-item.json"); - // Test with bad file content - MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.put(CONFIG_PRELOAD_LIST_URL+"preload1/network/").contentType(MediaType.APPLICATION_JSON).content(badContent)) - .andReturn(); - assertEquals(400, mvcResult.getResponse().getStatus()); - assertEquals(0, configPreloadDataRepository.count()); // Test with no data - mvcResult = mvc.perform(MockMvcRequestBuilders.put(CONFIG_PRELOAD_LIST_URL+"preload1/network/").contentType(MediaType.APPLICATION_JSON).content(goodContent)) + MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.put(CONFIG_PRELOAD_LIST_URL+"preload1/network/").contentType(MediaType.APPLICATION_JSON).content(goodContent)) .andReturn(); assertEquals(201, mvcResult.getResponse().getStatus()); assertEquals(1, configPreloadDataRepository.count()); @@ -318,11 +312,6 @@ public class ConfigApiPreloadControllerTest { preloadData.setPreloadData(null); configPreloadDataRepository.save(preloadData); - // Test with bad file content - MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.post(CONFIG_PRELOAD_LIST_URL+"preload1/network/preload-data/").contentType(MediaType.APPLICATION_JSON).content(badContent)) - .andReturn(); - assertEquals(400, mvcResult.getResponse().getStatus()); - assertEquals(1, configPreloadDataRepository.count()); } @@ -399,12 +388,6 @@ public class ConfigApiPreloadControllerTest { preloadData.setPreloadData(null); configPreloadDataRepository.save(preloadData); - // Test with bad file content - MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.put(CONFIG_PRELOAD_LIST_URL+"preload1/network/preload-data/").contentType(MediaType.APPLICATION_JSON).content(badContent)) - .andReturn(); - assertEquals(400, mvcResult.getResponse().getStatus()); - assertEquals(1, configPreloadDataRepository.count()); - } @Test diff --git a/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java index 603ff20..dd5a6a4 100644 --- a/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java +++ b/ms/gra/gra-app/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java @@ -182,7 +182,7 @@ public class ConfigApiServicesControllerTest { // Clean up data clearServicesData(); - String content = readFileContent("src/test/resources/service1.json"); + String content = readFileContent("src/test/resources/service1-services.json"); // Test with no data MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.post(CONFIG_SERVICES_URL).contentType(MediaType.APPLICATION_JSON).content(content)) @@ -206,7 +206,7 @@ public class ConfigApiServicesControllerTest { // Clean up data clearServicesData(); - String content = readFileContent("src/test/resources/service1.json"); + String content = readFileContent("src/test/resources/service1-services.json"); // Test with no data MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.put(CONFIG_SERVICES_URL).contentType(MediaType.APPLICATION_JSON).content(content)) @@ -643,12 +643,12 @@ public class ConfigApiServicesControllerTest { clearServicesData(); assertEquals(0, configServicesRepository.count()); assertEquals(0, configVnfsRepository.count()); - MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.put("/config/GENERIC-RESOURCE-API:services/service/"+TEST_SVC_INSTANCE_ID+"/service-data/vnfs/vnf/"+TEST_VNF_ID+"/").contentType(MediaType.APPLICATION_JSON).content(readFileContent("src/test/resources/vnf-data.json"))) + MvcResult mvcResult = mvc.perform(MockMvcRequestBuilders.put("/config/GENERIC-RESOURCE-API:services/service/"+TEST_SVC_INSTANCE_ID+"/service-data/vnfs/vnf/"+TEST_VNF_ID+"/").contentType(MediaType.APPLICATION_JSON).content(readFileContent("src/test/resources/vnf.json"))) .andReturn(); assertEquals(201, mvcResult.getResponse().getStatus()); assertEquals(1, configVnfsRepository.count()); - mvcResult = mvc.perform(MockMvcRequestBuilders.put("/config/GENERIC-RESOURCE-API:services/service/"+TEST_SVC_INSTANCE_ID+"/service-data/vnfs/vnf/"+TEST_VNF_ID+"/").contentType(MediaType.APPLICATION_JSON).content(readFileContent("src/test/resources/vnf-data.json"))) + mvcResult = mvc.perform(MockMvcRequestBuilders.put("/config/GENERIC-RESOURCE-API:services/service/"+TEST_SVC_INSTANCE_ID+"/service-data/vnfs/vnf/"+TEST_VNF_ID+"/").contentType(MediaType.APPLICATION_JSON).content(readFileContent("src/test/resources/vnf.json"))) .andReturn(); assertEquals(204, mvcResult.getResponse().getStatus()); assertEquals(1, configVnfsRepository.count()); diff --git a/ms/gra/gra-app/src/test/resources/GR_API.http b/ms/gra/gra-app/src/test/resources/GR_API.http index 5c5d827..1079d64 100644 --- a/ms/gra/gra-app/src/test/resources/GR_API.http +++ b/ms/gra/gra-app/src/test/resources/GR_API.http @@ -503,9 +503,9 @@ Accept: application/json "global-customer-id": "{{$guid}}",
"onap-model-information": {
"model-customization-uuid": "12341234",
- "model-invariant-uuid": "12341234",
+ "model-invariant-uuid": "b468c6c0-b3c2-462b-8712-1a7b487bc564",
"model-name": "vBNG_0202",
- "model-uuid": "00e50cbd-ef0f-4b28-821e-f2b583752dd3",
+ "model-uuid": "fd3d2a5e-0837-4776-abc1-d2bd923000e0",
"model-version": "1920"
},
"service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca",
@@ -858,7 +858,8 @@ Accept: application/json },
"sdnc-request-header" : {
"svc-request-id" : "svc-{{$guid}}",
- "svc-action" : "assign"
+ "svc-action" : "assign",
+ "svc-notification-url" : "http://dev.null"
},
"service-information" : {
"onap-model-information": {
@@ -1310,6 +1311,15 @@ Accept: application/json { input: {}}
+### vlbcheck
+POST {{hostname}}/restconf/operations/SLI-API:vlbcheck/
+Authorization: Basic {{token}}
+Content-Type: application/json
+Accept: application/json
+
+{ input: {}}
+
+
### get preload information (top)
GET {{hostname}}/restconf/config/GENERIC-RESOURCE-API:preload-information/
Authorization: Basic {{token}}
diff --git a/ms/gra/gra-app/src/test/resources/allotted-resource-item.json b/ms/gra/gra-app/src/test/resources/allotted-resource-item.json index 5aa3371..57b3661 100644 --- a/ms/gra/gra-app/src/test/resources/allotted-resource-item.json +++ b/ms/gra/gra-app/src/test/resources/allotted-resource-item.json @@ -1,28 +1,30 @@ { - "allotted-resource-id": "ar2", - "allotted-resource-data": { - "allotted-resource-oper-status": { - "create-timestamp": "2020-11-24T12:41:01.796Z", - "order-status": "Active" - }, - "contrail-route-topology": { - "contrail-route-assignments": { - "contrail-id": "cr2", - "dest-network": { - "network-id": "19cdfce4-9124-4bbf-83bd-5140931bb519", - "network-role": "pktmirror" + "contrail-route-allotted-resource": { + "allotted-resource-id": "ar2", + "allotted-resource-data": { + "allotted-resource-oper-status": { + "create-timestamp": "2020-11-24T12:41:01.796Z", + "order-status": "Active" + }, + "contrail-route-topology": { + "contrail-route-assignments": { + "contrail-id": "cr2", + "dest-network": { + "network-id": "19cdfce4-9124-4bbf-83bd-5140931bb519", + "network-role": "pktmirror" + }, + "fq-name": "default-domain.GRP-27529-T-IST-13C.GRP-27529-T-SIL-13C_gn_SCTPA_IP_net_12_dyh2b_GRP-27529-T-SIL-13C_gn_SCTPA_IP_pktmirror_policy_32", + "source-network": { + "network-id": "1610d17a-fb91-48ac-9d4c-43f739fdbe54", + "network-role": "GRP-27529-T-SIL-13C_gn_SCTPA_IP" + } }, - "fq-name": "default-domain.GRP-27529-T-IST-13C.GRP-27529-T-SIL-13C_gn_SCTPA_IP_net_12_dyh2b_GRP-27529-T-SIL-13C_gn_SCTPA_IP_pktmirror_policy_32", - "source-network": { - "network-id": "1610d17a-fb91-48ac-9d4c-43f739fdbe54", - "network-role": "GRP-27529-T-SIL-13C_gn_SCTPA_IP" + "allotted-resource-identifiers": { + "allotted-resource-id": "ar2", + "allotted-resource-type": "contrail-route", + "allotted-resource-name": "GRP-27529-T-SIL-13C_gn_SCTPA_IP_net_12_dyh2b_GRP-27529-T-SIL-13C_gn_SCTPA_IP_pktmirror_policy_32", + "parent-service-instance-id": "service1" } - }, - "allotted-resource-identifiers": { - "allotted-resource-id": "ar2", - "allotted-resource-type": "contrail-route", - "allotted-resource-name": "GRP-27529-T-SIL-13C_gn_SCTPA_IP_net_12_dyh2b_GRP-27529-T-SIL-13C_gn_SCTPA_IP_pktmirror_policy_32", - "parent-service-instance-id": "service1" } } } diff --git a/ms/gra/gra-app/src/test/resources/contrail-adaptor.properties b/ms/gra/gra-app/src/test/resources/contrail-adaptor.properties new file mode 100644 index 0000000..b1b02e6 --- /dev/null +++ b/ms/gra/gra-app/src/test/resources/contrail-adaptor.properties @@ -0,0 +1,37 @@ +keystone.username=admin +keystone.password=admin +tenant.password=admin +contrail.template.dir=/opt/lsc/restapi/templates +max.retry.count=3 +retry.wait=5000 +request.timeout=10000 + +simulateResponse=false +keystone.dummy.cache=true +orm.dummy.cache=true +use.orm=true + +cloud.config.use=false +cloud.config.filename=cloud_config.json +cloud.config.refresh.timer=1000 + +#orm.default_keystone_url_version=/v3 +orm.default_keystone_url_version=/v2.0 +orm.default_keystone_version_regex=/[vV][0-9] +orm.default_orm_url_replace_this=8080 +orm.default_orm_url_replace_with_this=7080 +orm.aic.client=ECOMP-SDNCP +contrail.url.regex=sdn-l-config + +#properties need to create json for policymanager configBody +configBody.service:NetworkPolicy +configBody.version:1.3.0.1 +configBody.configName:Search +configBody.policyScope:SDNC +configBody.templateVersion:1607 +configBody.location:Search +configBody.uuid:Search +configBody.priority:2 +configBody.riskType:low +configBody.riskLevel:2 +configBody.guard:True diff --git a/ms/gra/gra-app/src/test/resources/contrail-api-path.properties b/ms/gra/gra-app/src/test/resources/contrail-api-path.properties new file mode 100644 index 0000000..4c04d0e --- /dev/null +++ b/ms/gra/gra-app/src/test/resources/contrail-api-path.properties @@ -0,0 +1,59 @@ +network-policy.create.path=/network-policys +network-policy.create.method=NetworkPolicy.createNetworkPolicy +network-policy.create.hasTemplateFile=Y + +network-policy.get.path=/network-policy/{contrail-network-policy-id} +network-policy.get.method=NetworkPolicy.getNetworkPolicy +network-policy.get.hasTemplateFile=N + +network-policy.delete.path=/network-policy/{contrail-network-policy-id} +network-policy.delete.method=NetworkPolicy.deleteNetworkPolicy +network-policy.delete.hasTemplateFile=N + +network-policy.update.path=/network-policy/{contrail-network-policy-id} +network-policy.update.method=NetworkPolicy.updateNetworkPolicy +network-policy.update.hasTemplateFile=Y + +network-policy.apply.path=/virtual-network/{contrail-virtual-network-id} +network-policy.apply.method=NetworkPolicy.applyNetworkPolicy +network-policy.apply.hasTemplateFile=N + +network-policy.remove.path=/virtual-network/{contrail-virtual-network-id} +network-policy.remove.method=NetworkPolicy.removeNetworkPolicy +network-policy.remove.hasTemplateFile=N + +virtual-networks.get.path=/virtual-networks +virtual-networks.get.method=NetworkPolicy.getVirtualNetworks +virtual-networks.get.hasTemplateFile=N + +virtual-network.get.path=/virtual-network/{contrail-virtual-network-id} +virtual-network.get.method=NetworkPolicy.getVirtualNetwork +virtual-network.get.hasTemplateFile=N + +fqname-to-uuid.get.path=/fqname-to-id +fqname-to-uuid.get.method=NetworkPolicy.getFqNameToUuid +fqname-to-uuid.get.hasTemplateFile=Y + +id-to-fqname.get.path=/id-to-fqname +id-to-fqname.get.method=NetworkPolicy.getIdToFqName +id-to-fqname.get.hasTemplateFile=N + +virtual-machine-interface.get.path=/virtual-machine-interface/{contrail-virtual-machine-interface-id} +virtual-machine-interface.get.method=PortMirroring.getVirtualMachineInterface +virtual-machine-interface.get.hasTemplateFile=N + +port-mirroring.enable.path=/virtual-machine-interface/{contrail-virtual-machine-interface-id} +port-mirroring.enable.method=PortMirroring.enablePortMirroring +port-mirroring.enable.hasTemplateFile=Y + +port-mirroring.disable.path=/virtual-machine-interface/{contrail-virtual-machine-interface-id} +port-mirroring.disable.method=PortMirroring.disablePortMirroring +port-mirroring.disable.hasTemplateFile=Y + +subnet.add.path=/virtual-network/{contrail-virtual-network-id} +subnet.add.method=NetworkPolicy.addSubnet +subnet.add.hasTemplateFile=N + +subnet.delete.path=/virtual-network/{contrail-virtual-network-id} +subnet.delete.method=NetworkPolicy.deleteSubnet +subnet.delete.hasTemplateFile=N diff --git a/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml b/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml index ffb2eb3..8d2d0e6 100644 --- a/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml +++ b/ms/gra/gra-app/src/test/resources/db/changelog/db.changelog-master.yaml @@ -55328,4 +55328,73 @@ databaseChangeLog: name: vm_count valueNumeric: 1 tableName: VF_MODULE_TO_VFC_MAPPING +- changeSet: + id: 20210620-1 + author: dtimoney@att.com + changes: + - modifyDataType: + - tableName: CONFIG_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES + - columnName: allottedResourceStatusResponseMessage + - newDataType: varchar(2000) + - modifyDataType: + - tableName: CONFIG_GRA_PORT_MIRROR_CONFIGURATIONS + - columnName: portMirrorConfigurationStatusResponseMessage + - newDataType: varchar(2000) + - modifyDataType: + - tableName: OPERATIONAL_GRA_CONTRAIL_ROUTE_ALLOTTED_RESOURCES + - columnName: allottedResourceStatusResponseMessage + - newDataType: varchar(2000) + - modifyDataType: + - tableName: OPERATIONAL_GRA_PORT_MIRROR_CONFIGURATIONS + - columnName: portMirrorConfigurationStatusResponseMessage + - newDataType: varchar(2000) + - modifyDataType: + - tableName: CONFIG_GRA_SERVICES + - columnName: serviceStatusResponseMessage + - newDataType: varchar(2000) + - modifyDataType: + - tableName: OPERATIONAL_GRA_SERVICES + - columnName: serviceStatusResponseMessage + - newDataType: varchar(2000) +- changeSet: + id: 210806-1 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - tableExists: + tableName: PRE_LOAD_VNF_DATA + changes: + - modifyDataType: + - tableName: PRE_LOAD_VNF_DATA + - columnName: preload_data + - newDataType: clob + - modifyDataType: + - tableName: PRE_LOAD_VNF_DATA + - columnName: eipam_payload + - newDataType: clob + - modifyDataType: + - tableName: PRE_LOAD_VNF_DATA + - columnName: gr_api_data + - newDataType: clob +- changeSet: + id: 210806-2 + author: dtimoney@att.com + preConditions: + - onFail: MARK_RAN + - tableExists: + tableName: PRE_LOAD_VNF_NETWORK_DATA + changes: + - modifyDataType: + - tableName: PRE_LOAD_VNF_NETWORK_DATA + - columnName: preload_data + - newDataType: clob + - modifyDataType: + - tableName: PRE_LOAD_VNF_NETWORK_DATA + - columnName: eipam_payload + - newDataType: clob + - modifyDataType: + - tableName: PRE_LOAD_VNF_NETWORK_DATA + - columnName: gr_api_data + - newDataType: clob +
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/eipam.properties b/ms/gra/gra-app/src/test/resources/eipam.properties new file mode 100644 index 0000000..09f2b63 --- /dev/null +++ b/ms/gra/gra-app/src/test/resources/eipam.properties @@ -0,0 +1,63 @@ +eipam.templateDir=/opt/lsc/restapi/templates/ + +#mS is new in 1810, URL is driven by DME2 +eipam.service=microservice-router.lpp.att.com/services/microservice_router/v1/routes + +#DME proxy does not work in containers(1908), workaround is to call alternate.url +# 1906/1908 Can be Direct call or LGW to replace DME2 +#1906 Direct call +#eipam.alternate.url=https://st3-lppajsc.oss.att.com:8666/services/microservice_router/v1/routes +#1908 LGW to replace DME2 +#eipam.alternate.url=https://eipam1-ipaddress.dev.att.com +#eipam.rest.urlEndPoint=/eipam/rest/ipassignment/ +eipam.alternate.url=https://eipam-ipaddress1.stage.att.com + +# subContext for Direct Call, if used the LGW subContext below need to be commented out +#eipam.subContext.assign=/eipamIP/assign +#eipam.subContext.unassign=/eipamIP/unassign +#eipam.subContext.createPool=/eipamIP/createPool +#eipam.subContext.deletePool=/eipamIP/deletePool +#eipam.subContext.getPlanTopology=/eipamIP/topology +#eipam.subContext.getIPAddress=/eipamIP/getIP +#eipam.subContext.allocateSubnet=/eipamIP/allocate +#eipam.subContext.deallocateSubnet=/eipamIP/deallocate +#eipam.subContext.activateSubnet=/eipamIP/activateSubnet +#eipam.subContext.ping=/eipamIP/ping +#eipam.subContext.getPool=/eipamIP/getPool +#eipam.subContext.examineIP=/eipamIP/examineIP + +eipam.httpMethod.assign=PUT +eipam.httpMethod.unassign=POST +eipam.httpMethod.createPool=PUT +eipam.httpMethod.deletePool=POST +eipam.httpMethod.getPlanTopology=GET +eipam.httpMethod.getIPAddress=GET +eipam.httpMethod.allocateSubnet=PUT +eipam.httpMethod.deallocateSubnet=PUT +eipam.httpMethod.activateSubnet=PUT +eipam.httpMethod.ping=GET +eipam.httpMethod.getPool=POST +eipam.httpMethod.examineIP=POST + +# subContext for LGW, if used the above Direct Call subContext need to be commented out +eipam.subContext.assign=/eipam/restservices/v1/ipaddress/assign +eipam.subContext.unassign=/eipam/restservices/v1/ipaddress/unassign +eipam.subContext.createPool=/eipam/restservices/v1/ipaddress/pool +eipam.subContext.deletePool=/eipam/restservices/v1/ipaddress/pool/remove +eipam.subContext.getPlanTopology=/eipam/restservices/v1/ipaddress/plantopology +eipam.subContext.getIPAddress=/eipam/restservices/v1/ipaddress +eipam.subContext.allocateSubnet=/eipam/restservices/v1/ipaddress/subnet/allocate +eipam.subContext.deallocateSubnet=/eipam/restservices/v1/ipaddress/subnet/deallocate +eipam.subContext.activateSubnet=/eipam/restservices/v1/ipaddress/subnet/activate +eipam.subContext.ping=/eipam/restservices/v1/ipaddress/ping +eipam.subContext.getPool=/eipam/restservices/v1/ipaddress/pool +eipam.subContext.examineIP=/eipam/restservices/v1/ipaddress/examineIPAddressInfo + +eipam.connectionTimeout=30000 +eipam.receiveTimeout=60000 +#eipam.version=0.1 +#eipam.envContext=TEST +#eipam.routeOffer=ST3 +eipam.client=sdn_cp_ws +eipam.msgid=sdn +eipam.wss.user=sdn_cp_ws diff --git a/ms/gra/gra-app/src/test/resources/msoadaptor.properties b/ms/gra/gra-app/src/test/resources/msoadaptor.properties new file mode 100644 index 0000000..fb7fac9 --- /dev/null +++ b/ms/gra/gra-app/src/test/resources/msoadaptor.properties @@ -0,0 +1,5 @@ +adaptorName=com.att.sdnctl.sli.adaptor.mso.MSOAdaptor +mso.user=dummy +mso.passwd=dummy +mso.restriction.uri=https://msoapih-s3.ecomp.cci.att.com:30275/restriction +mso.sleep.timer=2000 diff --git a/ms/gra/gra-app/src/test/resources/port-mirror-configuration-item.json b/ms/gra/gra-app/src/test/resources/port-mirror-configuration-item.json index 780d079..8dcc69c 100644 --- a/ms/gra/gra-app/src/test/resources/port-mirror-configuration-item.json +++ b/ms/gra/gra-app/src/test/resources/port-mirror-configuration-item.json @@ -1,116 +1,118 @@ { - "configuration-data": { - "configuration-oper-status": { - "last-action": "CreatePortMirrorConfigurationInstance", - "last-rpc-action": "activate", - "order-status": "Active" - }, - "configuration-operation-information": { - "configuration-information": { - "configuration-id": "pm-config-2", - "configuration-sub-type": "vprobe", - "configuration-type": "PORT-MIRROR", - "onap-model-information": { - "model-customization-uuid": "770c991a-47fb-4225-8d72-4790847f8307", - "model-invariant-uuid": "a81abec0-222e-4fb2-b1c6-c4162359b2b3", - "model-name": "Port Mirroring Configuration", - "model-uuid": "18af239e-5397-4224-816f-d2850f3fab38", - "model-version": "23.0" - } + "port-mirror-configuration": { + "configuration-data": { + "configuration-oper-status": { + "last-action": "CreatePortMirrorConfigurationInstance", + "last-rpc-action": "activate", + "order-status": "Active" }, - "port-mirror-configuration-request-input": { - "dest-port": { - "vnf-information": { - "vnf-id": "039c2d5d-4efb-4145-9890-a6b5373cdfa5" + "configuration-operation-information": { + "configuration-information": { + "configuration-id": "pm-config-2", + "configuration-sub-type": "vprobe", + "configuration-type": "PORT-MIRROR", + "onap-model-information": { + "model-customization-uuid": "770c991a-47fb-4225-8d72-4790847f8307", + "model-invariant-uuid": "a81abec0-222e-4fb2-b1c6-c4162359b2b3", + "model-name": "Port Mirroring Configuration", + "model-uuid": "18af239e-5397-4224-816f-d2850f3fab38", + "model-version": "23.0" } }, - "source-port": { - "vnf-information": { - "vnf-id": "c5c92f5d-ed4d-4fb5-9ee1-b3eb562b1c6d" + "port-mirror-configuration-request-input": { + "dest-port": { + "vnf-information": { + "vnf-id": "039c2d5d-4efb-4145-9890-a6b5373cdfa5" + } + }, + "source-port": { + "vnf-information": { + "vnf-id": "c5c92f5d-ed4d-4fb5-9ee1-b3eb562b1c6d" + } } + }, + "request-information": { + "request-action": "CreatePortMirrorConfigurationInstance", + "request-id": "61fe8925-fb53-4968-b9de-74be4acd06cc", + "source": "MSO" + }, + "sdnc-request-header": { + "svc-action": "activate", + "svc-notification-url": "https://mso-sdnc-s3.ecomp.idns.aic.cip.att.com:30254/adapters/rest/SDNCNotify", + "svc-request-id": "ba937e51-6baf-486c-9851-3c6a646c9256" + }, + "service-information": { + "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5", + "subscription-service-type": "Mobility" } }, - "request-information": { - "request-action": "CreatePortMirrorConfigurationInstance", - "request-id": "61fe8925-fb53-4968-b9de-74be4acd06cc", - "source": "MSO" - }, - "sdnc-request-header": { - "svc-action": "activate", - "svc-notification-url": "https://mso-sdnc-s3.ecomp.idns.aic.cip.att.com:30254/adapters/rest/SDNCNotify", - "svc-request-id": "ba937e51-6baf-486c-9851-3c6a646c9256" - }, - "service-information": { - "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5", - "subscription-service-type": "Mobility" - } - }, - "port-mirror-configuration-topology": { - "configuration-identifiers": { - "configuration-id": "pm-config-2", - "configuration-name": "vMME02_VLC_Port_Mirroring_DYH2B_SCTPA", - "configuration-sub-type": "vprobe", - "configuration-type": "PORT-MIRROR", - "parent-service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5" - }, - "port-mirror-configuration-assignments": { - "cloud-owner": "att-aic", - "cloud-region-id": "dyh2b", - "dest-network-fqdn": "default-domain:GRP-27529-T-SIL-13B:GRP-27529-T-SIL-13B_vprobe_int_pkmirror1", - "dest-vnf-id": "039c2d5d-4efb-4145-9890-a6b5373cdfa5", - "dest-vnfc-instance-group-id": { + "port-mirror-configuration-topology": { + "configuration-identifiers": { "configuration-id": "pm-config-2", - "instance-group-role": "pktmirror", - "service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5" + "configuration-name": "vMME02_VLC_Port_Mirroring_DYH2B_SCTPA", + "configuration-sub-type": "vprobe", + "configuration-type": "PORT-MIRROR", + "parent-service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5" }, - "owning-entity": "10c645f5-9924-4b89-bec0-b17cf49d3cad", - "probe-type": "vprobe", - "route-allotted-resource-id": "286d41ea-d644-46b2-98fc-643ea1b591d1", - "source-capacity": 100000, - "source-network-fqdn": "default-domain:GRP-27529-T-IST-13C:GRP-27529-T-SIL-13C_gn_SCTPA_IP_net_12", - "source-to-dest-maps": { - "source-to-dest-map": [ - { - "dest-ip-addresses": { - "ip-addresses": { - "ipv4-address": "107.114.102.4" - } + "port-mirror-configuration-assignments": { + "cloud-owner": "att-aic", + "cloud-region-id": "dyh2b", + "dest-network-fqdn": "default-domain:GRP-27529-T-SIL-13B:GRP-27529-T-SIL-13B_vprobe_int_pkmirror1", + "dest-vnf-id": "039c2d5d-4efb-4145-9890-a6b5373cdfa5", + "dest-vnfc-instance-group-id": { + "configuration-id": "pm-config-2", + "instance-group-role": "pktmirror", + "service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5" + }, + "owning-entity": "10c645f5-9924-4b89-bec0-b17cf49d3cad", + "probe-type": "vprobe", + "route-allotted-resource-id": "286d41ea-d644-46b2-98fc-643ea1b591d1", + "source-capacity": 100000, + "source-network-fqdn": "default-domain:GRP-27529-T-IST-13C:GRP-27529-T-SIL-13C_gn_SCTPA_IP_net_12", + "source-to-dest-maps": { + "source-to-dest-map": [ + { + "dest-ip-addresses": { + "ip-addresses": { + "ipv4-address": "107.114.102.4" + } + }, + "dest-port-id": "b91beeda-fae3-4a99-9354-06c965db83f7", + "dest-port-name": "zdyh2bprbvlba_module04-vlbagent_eph_aff_0_int_pktmirror_port_0-m5ylyrybbmmb", + "dest-vserver-id": "9e2fc5ea-a88f-4955-bda8-10e75c173a8e", + "source-port-id": "7b6ee74c-cc2c-4290-95f2-2d89a3c4da74", + "source-port-name": "default-virtual-machine-interface-7b6ee74c-cc2c-4290-95f2-2d89a3c4da74", + "source-vserver-id": "2e3a8bb2-75ff-4e97-a888-961bfc624caa" }, - "dest-port-id": "b91beeda-fae3-4a99-9354-06c965db83f7", - "dest-port-name": "zdyh2bprbvlba_module04-vlbagent_eph_aff_0_int_pktmirror_port_0-m5ylyrybbmmb", - "dest-vserver-id": "9e2fc5ea-a88f-4955-bda8-10e75c173a8e", - "source-port-id": "7b6ee74c-cc2c-4290-95f2-2d89a3c4da74", - "source-port-name": "default-virtual-machine-interface-7b6ee74c-cc2c-4290-95f2-2d89a3c4da74", - "source-vserver-id": "2e3a8bb2-75ff-4e97-a888-961bfc624caa" - }, - { - "dest-ip-addresses": { - "ip-addresses": { - "ipv4-address": "107.114.102.3" - } - }, - "dest-port-id": "7cf3fda3-3153-4655-ae47-36fcf4439073", - "dest-port-name": "zdyh2bprbvlba_base_5-vlbagentbase_eph_aff_0_int_pktmirror_port_0-vkvey3eyoqk2", - "dest-vserver-id": "165db140-c09f-411a-bfdc-b8e6c7dbbda4", - "source-port-id": "0fd4c63c-6fda-4564-af10-d3be157279ef", - "source-port-name": "default-virtual-machine-interface-0fd4c63c-6fda-4564-af10-d3be157279ef", - "source-vserver-id": "b5bf2e1f-9f90-445c-be00-2c882e82d1d7" - } - ] - }, - "source-vnf-id": "c5c92f5d-ed4d-4fb5-9ee1-b3eb562b1c6d", - "source-vnfc-instance-group-id": { - "configuration-id": "pm-config-2", - "instance-group-role": "GRP-27529-T-SIL-13C_gn_SCTPA_IP", - "service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5" - }, - "tenant": "GRP-27529-T-IST-13C", - "tenant-context": "Test", - "tenant-id": "077445458306425499337c98bafc8c47", - "vnics-group-id": "97" + { + "dest-ip-addresses": { + "ip-addresses": { + "ipv4-address": "107.114.102.3" + } + }, + "dest-port-id": "7cf3fda3-3153-4655-ae47-36fcf4439073", + "dest-port-name": "zdyh2bprbvlba_base_5-vlbagentbase_eph_aff_0_int_pktmirror_port_0-vkvey3eyoqk2", + "dest-vserver-id": "165db140-c09f-411a-bfdc-b8e6c7dbbda4", + "source-port-id": "0fd4c63c-6fda-4564-af10-d3be157279ef", + "source-port-name": "default-virtual-machine-interface-0fd4c63c-6fda-4564-af10-d3be157279ef", + "source-vserver-id": "b5bf2e1f-9f90-445c-be00-2c882e82d1d7" + } + ] + }, + "source-vnf-id": "c5c92f5d-ed4d-4fb5-9ee1-b3eb562b1c6d", + "source-vnfc-instance-group-id": { + "configuration-id": "pm-config-2", + "instance-group-role": "GRP-27529-T-SIL-13C_gn_SCTPA_IP", + "service-instance-id": "156abc88-35d1-475a-85a1-e0e0a226cbd5" + }, + "tenant": "GRP-27529-T-IST-13C", + "tenant-context": "Test", + "tenant-id": "077445458306425499337c98bafc8c47", + "vnics-group-id": "97" + } } - } - }, - "configuration-id": "pm-config-2" + }, + "configuration-id": "pm-config-2" + } }
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/preload1-net-list-item.json b/ms/gra/gra-app/src/test/resources/preload1-net-list-item.json index 4a91388..29c6da0 100644 --- a/ms/gra/gra-app/src/test/resources/preload1-net-list-item.json +++ b/ms/gra/gra-app/src/test/resources/preload1-net-list-item.json @@ -1,81 +1,82 @@ { - "preload-id": "preload1", - "preload-type": "network", - "preload-data": { - "preload-network-topology-information": { - "host-routes": [ - { - "next-hop": "10.1.12.1", - "route-prefix": "12" - } - ], - "is-external-network": false, - "is-provider-network": false, - "is-shared-network": false, - "network-policy": [ - { - "network-policy-fqdn": "policy-sdnc.onap.org", - "network-policy-id": "123" - } - ], - "network-topology-identifier-structure": { - "eipam-v4-address-plan": "plan9", - "eipam-v6-address-plan": "plan9v6", - "is-trunked": true, - "network-id": "preload1", - "network-instance-group-id": "abc123", - "network-name": "syfy", - "network-role": "secret", - "network-technology": "soupcan", - "network-type": "fake", - "related-networks": { - "related-network": [ - { - "network-id": "skynet", - "network-role": "master", - "vlan-tags": { - "is-private": true, - "lower-tag-id": 0, - "upper-tag-id": 0, - "vlan-interface": "le0" + "preload-list": { + "preload-id": "preload1", + "preload-type": "network", + "preload-data": { + "preload-network-topology-information": { + "host-routes": [ + { + "next-hop": "10.1.12.1", + "route-prefix": "12" + } + ], + "is-external-network": false, + "is-provider-network": false, + "is-shared-network": false, + "network-policy": [ + { + "network-policy-fqdn": "policy-sdnc.onap.org", + "network-policy-id": "123" + } + ], + "network-topology-identifier-structure": { + "eipam-v4-address-plan": "plan9", + "eipam-v6-address-plan": "plan9v6", + "is-trunked": true, + "network-id": "preload1", + "network-instance-group-id": "abc123", + "network-name": "syfy", + "network-role": "secret", + "network-technology": "soupcan", + "network-type": "fake", + "related-networks": { + "related-network": [ + { + "network-id": "skynet", + "network-role": "master", + "vlan-tags": { + "is-private": true, + "lower-tag-id": 0, + "upper-tag-id": 0, + "vlan-interface": "le0" + } } - } - ] + ] + }, + "segmentation-id": "seg1" }, - "segmentation-id": "seg1" - }, - "physical-network-name": "skynet", - "route-table-reference": [ - { - "route-table-reference-fqdn": "sky.net", - "route-table-reference-id": "ref1" - } - ], - "subnets": [ - { - "addr-from-start": "Y", - "cidr-mask": "255.255.0.0", - "dhcp-enabled": "Y", - "dhcp-end-address": "10.1.2.254", - "dhcp-start-address": "10.1.2.1", - "gateway-address": "10.1.2.255", - "ip-version": "ipv4", - "start-address": "10.1.2.1", - "subnet-name": "subnet1", - "subnet-role": "puppies", - "subnet-sequence": 0 - } - ], - "vpn-bindings": [ - { - "aic-zone": "zone1", - "global-route-target": "string", - "route-target-role": "string", - "vpn-binding-id": "string", - "vpn-name": "string" - } - ] + "physical-network-name": "skynet", + "route-table-reference": [ + { + "route-table-reference-fqdn": "sky.net", + "route-table-reference-id": "ref1" + } + ], + "subnets": [ + { + "addr-from-start": "Y", + "cidr-mask": "255.255.0.0", + "dhcp-enabled": "Y", + "dhcp-end-address": "10.1.2.254", + "dhcp-start-address": "10.1.2.1", + "gateway-address": "10.1.2.255", + "ip-version": "ipv4", + "start-address": "10.1.2.1", + "subnet-name": "subnet1", + "subnet-role": "puppies", + "subnet-sequence": 0 + } + ], + "vpn-bindings": [ + { + "aic-zone": "zone1", + "global-route-target": "string", + "route-target-role": "string", + "vpn-binding-id": "string", + "vpn-name": "string" + } + ] + } } } -} - +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/preload1-net-model-info.json b/ms/gra/gra-app/src/test/resources/preload1-net-model-info.json index 586915a..80dbc1c 100644 --- a/ms/gra/gra-app/src/test/resources/preload1-net-model-info.json +++ b/ms/gra/gra-app/src/test/resources/preload1-net-model-info.json @@ -1,84 +1,86 @@ { - "preload-list": [ - { - "preload-id": "preload1", - "preload-type": "network", - "preload-data": { - "preload-network-topology-information": { - "host-routes": [ - { - "next-hop": "10.1.12.1", - "route-prefix": "12" - } - ], - "is-external-network": true, - "is-provider-network": true, - "is-shared-network": true, - "network-policy": [ - { - "network-policy-fqdn": "policy-sdnc.onap.org", - "network-policy-id": "123" - } - ], - "network-topology-identifier-structure": { - "eipam-v4-address-plan": "plan9", - "eipam-v6-address-plan": "plan9v6", - "is-trunked": true, - "network-id": "preload1", - "network-instance-group-id": "abc123", - "network-name": "syfy", - "network-role": "secret", - "network-technology": "soupcan", - "network-type": "fake", - "related-networks": { - "related-network": [ - { - "network-id": "skynet", - "network-role": "master", - "vlan-tags": { - "is-private": true, - "lower-tag-id": 0, - "upper-tag-id": 0, - "vlan-interface": "le0" + "preload-information": { + "preload-list": [ + { + "preload-id": "preload1", + "preload-type": "network", + "preload-data": { + "preload-network-topology-information": { + "host-routes": [ + { + "next-hop": "10.1.12.1", + "route-prefix": "12" + } + ], + "is-external-network": true, + "is-provider-network": true, + "is-shared-network": true, + "network-policy": [ + { + "network-policy-fqdn": "policy-sdnc.onap.org", + "network-policy-id": "123" + } + ], + "network-topology-identifier-structure": { + "eipam-v4-address-plan": "plan9", + "eipam-v6-address-plan": "plan9v6", + "is-trunked": true, + "network-id": "preload1", + "network-instance-group-id": "abc123", + "network-name": "syfy", + "network-role": "secret", + "network-technology": "soupcan", + "network-type": "fake", + "related-networks": { + "related-network": [ + { + "network-id": "skynet", + "network-role": "master", + "vlan-tags": { + "is-private": true, + "lower-tag-id": 0, + "upper-tag-id": 0, + "vlan-interface": "le0" + } } - } - ] + ] + }, + "segmentation-id": "seg1" }, - "segmentation-id": "seg1" - }, - "physical-network-name": "skynet", - "route-table-reference": [ - { - "route-table-reference-fqdn": "sky.net", - "route-table-reference-id": "ref1" - } - ], - "subnets": [ - { - "addr-from-start": "Y", - "cidr-mask": "255.255.0.0", - "dhcp-enabled": "Y", - "dhcp-end-address": "10.1.2.254", - "dhcp-start-address": "10.1.2.1", - "gateway-address": "10.1.2.255", - "ip-version": "ipv4", - "start-address": "10.1.2.1", - "subnet-name": "subnet1", - "subnet-role": "puppies", - "subnet-sequence": 0 - } - ], - "vpn-bindings": [ - { - "aic-zone": "zone1", - "global-route-target": "string", - "route-target-role": "string", - "vpn-binding-id": "string", - "vpn-name": "string" - } - ] + "physical-network-name": "skynet", + "route-table-reference": [ + { + "route-table-reference-fqdn": "sky.net", + "route-table-reference-id": "ref1" + } + ], + "subnets": [ + { + "addr-from-start": "Y", + "cidr-mask": "255.255.0.0", + "dhcp-enabled": "Y", + "dhcp-end-address": "10.1.2.254", + "dhcp-start-address": "10.1.2.1", + "gateway-address": "10.1.2.255", + "ip-version": "ipv4", + "start-address": "10.1.2.1", + "subnet-name": "subnet1", + "subnet-role": "puppies", + "subnet-sequence": 0 + } + ], + "vpn-bindings": [ + { + "aic-zone": "zone1", + "global-route-target": "string", + "route-target-role": "string", + "vpn-binding-id": "string", + "vpn-name": "string" + } + ] + } } } - } - ] -} + ] + } +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/preload1-net-preload-data.json b/ms/gra/gra-app/src/test/resources/preload1-net-preload-data.json index 74da3de..ed9f326 100644 --- a/ms/gra/gra-app/src/test/resources/preload1-net-preload-data.json +++ b/ms/gra/gra-app/src/test/resources/preload1-net-preload-data.json @@ -1,5 +1,5 @@ { - + "preload-data": { "preload-network-topology-information": { "host-routes": [ { @@ -74,5 +74,5 @@ } ] } -} - + } +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1-service.json b/ms/gra/gra-app/src/test/resources/service1-service.json index abf7da2..3f289cf 100644 --- a/ms/gra/gra-app/src/test/resources/service1-service.json +++ b/ms/gra/gra-app/src/test/resources/service1-service.json @@ -1,69 +1,67 @@ { - "service": [ - { - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "service-data": { - "request-information": { - "notification-url": "http://dev.null", - "request-id": "req123", - "order-number": "123", - "request-action": "CreateServiceInstance", - "order-version": "version1", - "source": "curl" - }, - "service-request-input": { - "service-instance-name": "zrdm61asmsf01_svc" + "service": [{ + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-data": { + "request-information": { + "notification-url": "http://dev.null", + "request-id": "req123", + "order-number": "123", + "request-action": "CreateServiceInstance", + "order-version": "version1", + "source": "curl" + }, + "service-request-input": { + "service-instance-name": "zrdm61asmsf01_svc" + }, + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-invariant-uuid": "12341234", + "model-name": "vBNG_0202", + "model-version": "1920", + "model-customization-uuid": "12341234", + "model-uuid": "00e50cbd-ef0f-4b28-821e-f2b583752dd3" }, - "service-information": { - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "onap-model-information": { - "model-invariant-uuid": "12341234", - "model-name": "vBNG_0202", - "model-version": "1920", - "model-customization-uuid": "12341234", - "model-uuid": "00e50cbd-ef0f-4b28-821e-f2b583752dd3" - }, - "global-customer-id": "cust123", - "subscription-service-type": "test", + "global-customer-id": "cust123", + "subscription-service-type": "test", + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "subscriber-name": "test" + }, + "service-topology": { + "service-topology-identifier": { "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "subscriber-name": "test" + "service-instance-name": "zrdm61asmsf01_svc", + "service-type": "test", + "global-customer-id": "cust123" }, - "service-topology": { - "service-topology-identifier": { - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "service-instance-name": "zrdm61asmsf01_svc", - "service-type": "test", - "global-customer-id": "cust123" - }, - "onap-model-information": { - "model-invariant-uuid": "12341234", - "model-name": "vBNG_0202", - "model-version": "1920", - "model-customization-uuid": "12341234", - "model-uuid": "00e50cbd-ef0f-4b28-821e-f2b583752dd3" - } - }, - "service-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "assign", - "last-action": "CreateServiceInstance" - }, - "sdnc-request-header": { - "svc-action": "assign", - "svc-notification-url": "http://dev.null", - "svc-request-id": "svcreq123" + "onap-model-information": { + "model-invariant-uuid": "12341234", + "model-name": "vBNG_0202", + "model-version": "1920", + "model-customization-uuid": "12341234", + "model-uuid": "00e50cbd-ef0f-4b28-821e-f2b583752dd3" } }, - "service-status": { - "final-indicator": "Y", - "rpc-action": "assign", - "rpc-name": "service-topology-operation", - "response-code": "200", - "response-timestamp": "2020-08-17T12:29:24.031Z", - "response-message": "", - "action": "CreateServiceInstance", - "request-status": "synccomplete" + "service-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "assign", + "last-action": "CreateServiceInstance" + }, + "sdnc-request-header": { + "svc-action": "assign", + "svc-notification-url": "http://dev.null", + "svc-request-id": "svcreq123" } + }, + "service-status": { + "final-indicator": "Y", + "rpc-action": "assign", + "rpc-name": "service-topology-operation", + "response-code": "200", + "response-timestamp": "2020-08-17T12:29:24.031Z", + "response-message": "", + "action": "CreateServiceInstance", + "request-status": "synccomplete" } - ] -} + }] +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1-servicedata.json b/ms/gra/gra-app/src/test/resources/service1-servicedata.json index 8521b76..cd97888 100644 --- a/ms/gra/gra-app/src/test/resources/service1-servicedata.json +++ b/ms/gra/gra-app/src/test/resources/service1-servicedata.json @@ -1,221 +1,220 @@ { - "request-information": { - "request-id": "f5554477-51c7-4f8e-9183-f8968f3f86bf", - "request-action": "CreateServiceInstance", - "source": "MSO" - }, - "service-request-input": { - "service-instance-name": "zrdm61asmsf01_svc" - }, - "service-information": { - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + "service-data": { + "request-information": { + "request-id": "f5554477-51c7-4f8e-9183-f8968f3f86bf", + "request-action": "CreateServiceInstance", + "source": "MSO" }, - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "global-customer-id": "cust123", - "subscription-service-type": "test" - }, - "service-topology": { - "service-topology-identifier": { + "service-request-input": { + "service-instance-name": "zrdm61asmsf01_svc" + }, + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "service-instance-name": "zrdm61asmsf01_svc", - "service-type": "service-nginx-ingress-1", - "global-customer-id": "Demonstration" + "global-customer-id": "cust123", + "subscription-service-type": "test" }, - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" - } - }, - "service-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "assign", - "last-action": "CreateServiceInstance" - }, - "sdnc-request-header": { - "svc-action": "assign", - "svc-request-id": "6d06a832-69da-4369-9d99-049767a39400" - }, - "vnfs": { - "vnf": [ - { - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "vnf-data": { - "vnf-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "activate", - "last-action": "CreateVnfInstance" - }, - "service-information": { - "service-id": "service1", - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + "service-topology": { + "service-topology-identifier": { + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-instance-name": "zrdm61asmsf01_svc", + "service-type": "service-nginx-ingress-1", + "global-customer-id": "Demonstration" + }, + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + } + }, + "service-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "assign", + "last-action": "CreateServiceInstance" + }, + "sdnc-request-header": { + "svc-action": "assign", + "svc-request-id": "6d06a832-69da-4369-9d99-049767a39400" + }, + "vnfs": { + "vnf": [ + { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-data": { + "vnf-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "activate", + "last-action": "CreateVnfInstance" }, - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "global-customer-id": "cust123", - "subscription-service-type": "service-nginx-ingress-1" - }, - "sdnc-request-header": { - "svc-action": "activate", - "svc-request-id": "acf0c0db-106f-42e4-b77b-191e9d229eb9", - "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/b8f92243-85cb-4954-970d-7e0159b9a48b" - }, - "vnf-information": { - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "onap-model-information": { - "model-name": "nginx-ingress-1", - "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", - "model-version": "1.0", - "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", - "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + "service-information": { + "service-id": "service1", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "cust123", + "subscription-service-type": "service-nginx-ingress-1" }, - "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", - "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" - }, - "request-information": { - "request-id": "c382d6d1-2108-4c39-ab7a-c3e67cdbc749", - "request-action": "CreateVnfInstance", - "source": "MSO" - }, - "vnf-request-input": { - "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2", - "tenant": "k8s_tenant_1", - "cloud-owner": "k8sCloudOwner", - "aic-cloud-region": "k8s_region_1" - }, - "vnf-topology": { - "onap-model-information": { - "model-name": "nginx-ingress-1", - "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", - "model-version": "1.0", - "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", - "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + "sdnc-request-header": { + "svc-action": "activate", + "svc-request-id": "acf0c0db-106f-42e4-b77b-191e9d229eb9", + "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/b8f92243-85cb-4954-970d-7e0159b9a48b" }, - "tenant": "k8s_tenant_1", - "aic-clli": "complexMC", - "aic-cloud-region": "k8s_region_1", - "vnf-topology-identifier-structure": { + "vnf-information": { "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" }, - "vnf-resource-assignments": { - "availability-zones": { - "availability-zone": [ - "k8s_availability_zone_1" - ] + "request-information": { + "request-id": "c382d6d1-2108-4c39-ab7a-c3e67cdbc749", + "request-action": "CreateVnfInstance", + "source": "MSO" + }, + "vnf-request-input": { + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2", + "tenant": "k8s_tenant_1", + "cloud-owner": "k8sCloudOwner", + "aic-cloud-region": "k8s_region_1" + }, + "vnf-topology": { + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "tenant": "k8s_tenant_1", + "aic-clli": "complexMC", + "aic-cloud-region": "k8s_region_1", + "vnf-topology-identifier-structure": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" + }, + "vnf-resource-assignments": { + "availability-zones": { + "availability-zone": [ + "k8s_availability_zone_1" + ] + } } - } - }, - "vf-modules": { - "vf-module": [ - { - "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", - "vf-module-data": { - "service-information": { - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "vf-modules": { + "vf-module": [ + { + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-data": { + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "cust123", + "subscription-service-type": "test" }, - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "global-customer-id": "cust123", - "subscription-service-type": "test" - }, - "vf-module-topology": { - "onap-model-information": { - "model-name": "NginxIngress1..nginx-ingress..module-0", - "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", - "model-version": "1", - "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", - "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + "vf-module-topology": { + "onap-model-information": { + "model-name": "NginxIngress1..nginx-ingress..module-0", + "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", + "model-version": "1", + "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", + "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + }, + "vf-module-parameters": { + "param": [ + { + "name": "availability_zone_0", + "value": "k8s_availability_zone_1" + }, + { + "name": "k8s-rb-profile-name", + "value": "default" + } + ] + }, + "tenant": "k8s_tenant_1", + "sdnc-generated-cloud-resources": true, + "aic-clli": "complexMC", + "vf-module-topology-identifier": { + "vf-module-type": "NginxIngress1..nginx-ingress..module-0", + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb" + }, + "aic-cloud-region": "k8s_region_1" }, - "vf-module-parameters": { - "param": [ - { - "name": "availability_zone_0", - "value": "k8s_availability_zone_1" - }, - { - "name": "k8s-rb-profile-name", - "value": "default" - } - ] + "vf-module-request-input": { + "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb", + "tenant": "k8s_tenant_1", + "cloud-owner": "k8sCloudOwner", + "aic-cloud-region": "k8s_region_1" }, - "tenant": "k8s_tenant_1", - "sdnc-generated-cloud-resources": true, - "aic-clli": "complexMC", - "vf-module-topology-identifier": { - "vf-module-type": "NginxIngress1..nginx-ingress..module-0", - "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", - "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb" + "sdnc-request-header": { + "svc-action": "activate", + "svc-request-id": "bf81d48a-d5f9-42f2-bc49-9277f0e2a836", + "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/64780567-ecf5-41c9-af36-bb06f8ae0e5d" }, - "aic-cloud-region": "k8s_region_1" - }, - "vf-module-request-input": { - "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb", - "tenant": "k8s_tenant_1", - "cloud-owner": "k8sCloudOwner", - "aic-cloud-region": "k8s_region_1" - }, - "sdnc-request-header": { - "svc-action": "activate", - "svc-request-id": "bf81d48a-d5f9-42f2-bc49-9277f0e2a836", - "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/64780567-ecf5-41c9-af36-bb06f8ae0e5d" - }, - "vnf-information": { - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "onap-model-information": { - "model-name": "nginx-ingress-1", - "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", - "model-version": "1.0", - "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", - "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + "vnf-information": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" + }, + "vf-module-information": { + "onap-model-information": { + "model-name": "NginxIngress1..nginx-ingress..module-0", + "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", + "model-version": "1", + "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", + "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + }, + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-type": "NginxIngress1..nginx-ingress..module-0", + "from-preload": true }, - "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", - "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" - }, - "vf-module-information": { - "onap-model-information": { - "model-name": "NginxIngress1..nginx-ingress..module-0", - "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", - "model-version": "1", - "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", - "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + "request-information": { + "request-id": "051f3665-002c-4e3c-b62e-f8c0b48ef12e", + "request-action": "CreateVfModuleInstance", + "source": "MSO" }, - "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", - "vf-module-type": "NginxIngress1..nginx-ingress..module-0", - "from-preload": true - }, - "request-information": { - "request-id": "051f3665-002c-4e3c-b62e-f8c0b48ef12e", - "request-action": "CreateVfModuleInstance", - "source": "MSO" - }, - "vf-module-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "activate" + "vf-module-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "activate" + } } } - } - ] + ] + } } } - } - ] + ] + } } -} - - - +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1-serviceitem.json b/ms/gra/gra-app/src/test/resources/service1-serviceitem.json index aad2096..417f62f 100644 --- a/ms/gra/gra-app/src/test/resources/service1-serviceitem.json +++ b/ms/gra/gra-app/src/test/resources/service1-serviceitem.json @@ -1,233 +1,233 @@ { - "service-instance-id": "service1", - "service-data": { - "request-information": { - "request-id": "f5554477-51c7-4f8e-9183-f8968f3f86bf", - "request-action": "CreateServiceInstance", - "source": "MSO" - }, - "service-request-input": { - "service-instance-name": "zrdm61asmsf01_svc" - }, - "service-information": { - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + "service": { + "service-instance-id": "service1", + "service-data": { + "request-information": { + "request-id": "f5554477-51c7-4f8e-9183-f8968f3f86bf", + "request-action": "CreateServiceInstance", + "source": "MSO" }, - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "global-customer-id": "cust123", - "subscription-service-type": "test" - }, - "service-topology": { - "service-topology-identifier": { + "service-request-input": { + "service-instance-name": "zrdm61asmsf01_svc" + }, + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "service-instance-name": "zrdm61asmsf01_svc", - "service-type": "test", - "global-customer-id": "cust123" + "global-customer-id": "cust123", + "subscription-service-type": "test" }, - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" - } - }, - "service-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "assign", - "last-action": "CreateServiceInstance" - }, - "sdnc-request-header": { - "svc-action": "assign", - "svc-request-id": "6d06a832-69da-4369-9d99-049767a39400" - }, - "vnfs": { - "vnf": [ - { - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "vnf-data": { - "vnf-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "activate", - "last-action": "CreateVnfInstance" - }, - "service-information": { - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + "service-topology": { + "service-topology-identifier": { + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-instance-name": "zrdm61asmsf01_svc", + "service-type": "test", + "global-customer-id": "cust123" + }, + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + } + }, + "service-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "assign", + "last-action": "CreateServiceInstance" + }, + "sdnc-request-header": { + "svc-action": "assign", + "svc-request-id": "6d06a832-69da-4369-9d99-049767a39400" + }, + "vnfs": { + "vnf": [ + { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-data": { + "vnf-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "activate", + "last-action": "CreateVnfInstance" }, - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "global-customer-id": "cust123", - "subscription-service-type": "test" - }, - "sdnc-request-header": { - "svc-action": "activate", - "svc-request-id": "acf0c0db-106f-42e4-b77b-191e9d229eb9", - "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/b8f92243-85cb-4954-970d-7e0159b9a48b" - }, - "vnf-information": { - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "onap-model-information": { - "model-name": "nginx-ingress-1", - "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", - "model-version": "1.0", - "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", - "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "cust123", + "subscription-service-type": "test" }, - "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", - "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" - }, - "request-information": { - "request-id": "c382d6d1-2108-4c39-ab7a-c3e67cdbc749", - "request-action": "CreateVnfInstance", - "source": "MSO" - }, - "vnf-request-input": { - "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2", - "tenant": "k8s_tenant_1", - "cloud-owner": "k8sCloudOwner", - "aic-cloud-region": "k8s_region_1" - }, - "vnf-topology": { - "onap-model-information": { - "model-name": "nginx-ingress-1", - "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", - "model-version": "1.0", - "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", - "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + "sdnc-request-header": { + "svc-action": "activate", + "svc-request-id": "acf0c0db-106f-42e4-b77b-191e9d229eb9", + "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/b8f92243-85cb-4954-970d-7e0159b9a48b" }, - "tenant": "k8s_tenant_1", - "aic-clli": "complexMC", - "aic-cloud-region": "k8s_region_1", - "vnf-topology-identifier-structure": { + "vnf-information": { "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" }, - "vnf-resource-assignments": { - "availability-zones": { - "availability-zone": [ - "k8s_availability_zone_1" - ] + "request-information": { + "request-id": "c382d6d1-2108-4c39-ab7a-c3e67cdbc749", + "request-action": "CreateVnfInstance", + "source": "MSO" + }, + "vnf-request-input": { + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2", + "tenant": "k8s_tenant_1", + "cloud-owner": "k8sCloudOwner", + "aic-cloud-region": "k8s_region_1" + }, + "vnf-topology": { + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "tenant": "k8s_tenant_1", + "aic-clli": "complexMC", + "aic-cloud-region": "k8s_region_1", + "vnf-topology-identifier-structure": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" + }, + "vnf-resource-assignments": { + "availability-zones": { + "availability-zone": [ + "k8s_availability_zone_1" + ] + } } - } - }, - "vf-modules": { - "vf-module": [ - { - "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", - "vf-module-data": { - "service-information": { - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "onap-model-information": { - "model-name": "service-nginx-ingress-1", - "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", - "model-version": "1.0", - "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "vf-modules": { + "vf-module": [ + { + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-data": { + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "cust123", + "subscription-service-type": "test" }, - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "global-customer-id": "cust123", - "subscription-service-type": "test" - }, - "vf-module-topology": { - "onap-model-information": { - "model-name": "NginxIngress1..nginx-ingress..module-0", - "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", - "model-version": "1", - "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", - "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + "vf-module-topology": { + "onap-model-information": { + "model-name": "NginxIngress1..nginx-ingress..module-0", + "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", + "model-version": "1", + "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", + "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + }, + "vf-module-parameters": { + "param": [ + { + "name": "availability_zone_0", + "value": "k8s_availability_zone_1" + }, + { + "name": "k8s-rb-profile-name", + "value": "default" + } + ] + }, + "tenant": "k8s_tenant_1", + "sdnc-generated-cloud-resources": true, + "aic-clli": "complexMC", + "vf-module-topology-identifier": { + "vf-module-type": "NginxIngress1..nginx-ingress..module-0", + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb" + }, + "aic-cloud-region": "k8s_region_1" }, - "vf-module-parameters": { - "param": [ - { - "name": "availability_zone_0", - "value": "k8s_availability_zone_1" - }, - { - "name": "k8s-rb-profile-name", - "value": "default" - } - ] + "vf-module-request-input": { + "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb", + "tenant": "k8s_tenant_1", + "cloud-owner": "k8sCloudOwner", + "aic-cloud-region": "k8s_region_1" }, - "tenant": "k8s_tenant_1", - "sdnc-generated-cloud-resources": true, - "aic-clli": "complexMC", - "vf-module-topology-identifier": { - "vf-module-type": "NginxIngress1..nginx-ingress..module-0", - "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", - "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb" + "sdnc-request-header": { + "svc-action": "activate", + "svc-request-id": "bf81d48a-d5f9-42f2-bc49-9277f0e2a836", + "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/64780567-ecf5-41c9-af36-bb06f8ae0e5d" }, - "aic-cloud-region": "k8s_region_1" - }, - "vf-module-request-input": { - "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb", - "tenant": "k8s_tenant_1", - "cloud-owner": "k8sCloudOwner", - "aic-cloud-region": "k8s_region_1" - }, - "sdnc-request-header": { - "svc-action": "activate", - "svc-request-id": "bf81d48a-d5f9-42f2-bc49-9277f0e2a836", - "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/64780567-ecf5-41c9-af36-bb06f8ae0e5d" - }, - "vnf-information": { - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "onap-model-information": { - "model-name": "nginx-ingress-1", - "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", - "model-version": "1.0", - "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", - "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + "vnf-information": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" }, - "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", - "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" - }, - "vf-module-information": { - "onap-model-information": { - "model-name": "NginxIngress1..nginx-ingress..module-0", - "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", - "model-version": "1", - "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", - "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + "vf-module-information": { + "onap-model-information": { + "model-name": "NginxIngress1..nginx-ingress..module-0", + "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", + "model-version": "1", + "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", + "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + }, + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-type": "NginxIngress1..nginx-ingress..module-0", + "from-preload": true }, - "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", - "vf-module-type": "NginxIngress1..nginx-ingress..module-0", - "from-preload": true - }, - "request-information": { - "request-id": "051f3665-002c-4e3c-b62e-f8c0b48ef12e", - "request-action": "CreateVfModuleInstance", - "source": "MSO" - }, - "vf-module-level-oper-status": { - "order-status": "Created", - "last-rpc-action": "activate" + "request-information": { + "request-id": "051f3665-002c-4e3c-b62e-f8c0b48ef12e", + "request-action": "CreateVfModuleInstance", + "source": "MSO" + }, + "vf-module-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "activate" + } } } - } - ] + ] + } } } - } - ] + ] + } + }, + "service-status": { + "final-indicator": "Y", + "rpc-action": "activate", + "rpc-name": "vf-module-topology-operation", + "response-code": "200", + "response-timestamp": "2020-06-24T13:06:24.525Z", + "response-message": "", + "action": "CreateVfModuleInstance", + "request-status": "synccomplete" } - }, - "service-status": { - "final-indicator": "Y", - "rpc-action": "activate", - "rpc-name": "vf-module-topology-operation", - "response-code": "200", - "response-timestamp": "2020-06-24T13:06:24.525Z", - "response-message": "", - "action": "CreateVfModuleInstance", - "request-status": "synccomplete" } -} - - +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1-services.json b/ms/gra/gra-app/src/test/resources/service1-services.json new file mode 100644 index 0000000..28117b9 --- /dev/null +++ b/ms/gra/gra-app/src/test/resources/service1-services.json @@ -0,0 +1,237 @@ +{ + "services": { + "service": [ + { + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-data": { + "request-information": { + "request-id": "f5554477-51c7-4f8e-9183-f8968f3f86bf", + "request-action": "CreateServiceInstance", + "source": "MSO" + }, + "service-request-input": { + "service-instance-name": "zrdm61asmsf01_svc" + }, + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "Demonstration", + "subscription-service-type": "service-nginx-ingress-1" + }, + "service-topology": { + "service-topology-identifier": { + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-instance-name": "zrdm61asmsf01_svc", + "service-type": "service-nginx-ingress-1", + "global-customer-id": "Demonstration" + }, + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + } + }, + "service-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "assign", + "last-action": "CreateServiceInstance" + }, + "sdnc-request-header": { + "svc-action": "assign", + "svc-request-id": "6d06a832-69da-4369-9d99-049767a39400" + }, + "vnfs": { + "vnf": [ + { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-data": { + "vnf-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "activate", + "last-action": "CreateVnfInstance" + }, + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "Demonstration", + "subscription-service-type": "service-nginx-ingress-1" + }, + "sdnc-request-header": { + "svc-action": "activate", + "svc-request-id": "acf0c0db-106f-42e4-b77b-191e9d229eb9", + "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/b8f92243-85cb-4954-970d-7e0159b9a48b" + }, + "vnf-information": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" + }, + "request-information": { + "request-id": "c382d6d1-2108-4c39-ab7a-c3e67cdbc749", + "request-action": "CreateVnfInstance", + "source": "MSO" + }, + "vnf-request-input": { + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2", + "tenant": "k8s_tenant_1", + "cloud-owner": "k8sCloudOwner", + "aic-cloud-region": "k8s_region_1" + }, + "vnf-topology": { + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "tenant": "k8s_tenant_1", + "aic-clli": "complexMC", + "aic-cloud-region": "k8s_region_1", + "vnf-topology-identifier-structure": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" + }, + "vnf-resource-assignments": { + "availability-zones": { + "availability-zone": [ + "k8s_availability_zone_1" + ] + } + } + }, + "vf-modules": { + "vf-module": [ + { + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-data": { + "service-information": { + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "onap-model-information": { + "model-name": "service-nginx-ingress-1", + "model-invariant-uuid": "0fe6193d-2d65-4b8e-a4ee-a07821566b5e", + "model-version": "1.0", + "model-uuid": "48223a6a-f5e1-4354-95eb-f5ea014fc9df" + }, + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "global-customer-id": "Demonstration", + "subscription-service-type": "service-nginx-ingress-1" + }, + "vf-module-topology": { + "onap-model-information": { + "model-name": "NginxIngress1..nginx-ingress..module-0", + "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", + "model-version": "1", + "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", + "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + }, + "vf-module-parameters": { + "param": [ + { + "name": "availability_zone_0", + "value": "k8s_availability_zone_1" + }, + { + "name": "k8s-rb-profile-name", + "value": "default" + } + ] + }, + "tenant": "k8s_tenant_1", + "sdnc-generated-cloud-resources": true, + "aic-clli": "complexMC", + "vf-module-topology-identifier": { + "vf-module-type": "NginxIngress1..nginx-ingress..module-0", + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb" + }, + "aic-cloud-region": "k8s_region_1" + }, + "vf-module-request-input": { + "vf-module-name": "Python_ONAP_SDK_vf_module_instance_678cc889-0c89-40f3-9f5b-1f475d5c4ebb", + "tenant": "k8s_tenant_1", + "cloud-owner": "k8sCloudOwner", + "aic-cloud-region": "k8s_region_1" + }, + "sdnc-request-header": { + "svc-action": "activate", + "svc-request-id": "bf81d48a-d5f9-42f2-bc49-9277f0e2a836", + "svc-notification-url": "http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/SDNCCallback/64780567-ecf5-41c9-af36-bb06f8ae0e5d" + }, + "vnf-information": { + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "onap-model-information": { + "model-name": "nginx-ingress-1", + "model-invariant-uuid": "ebd1565b-a98f-4d77-9b91-6aefd51d040c", + "model-version": "1.0", + "model-customization-uuid": "69cff101-d1f2-4bf3-9697-57f52ba3c5dd", + "model-uuid": "dfeccc32-2459-43bf-bfdd-36567e696090" + }, + "vnf-type": "service-nginx-ingress-1/nginx-ingress-1 0", + "vnf-name": "Python_ONAP_SDK_vnf_instance_2aff902a-4714-4d08-942d-d97b3a3b87c2" + }, + "vf-module-information": { + "onap-model-information": { + "model-name": "NginxIngress1..nginx-ingress..module-0", + "model-invariant-uuid": "caa22b8e-e0de-4d2c-9048-9a71d39afd91", + "model-version": "1", + "model-customization-uuid": "d6403fe2-ebe4-4fce-bec2-0218f61b2564", + "model-uuid": "e5d2fe74-9534-4a7c-9a1b-f49ecf1105e3" + }, + "vf-module-id": "269bda16-f40c-41a9-baef-e8905ab2b70e", + "vf-module-type": "NginxIngress1..nginx-ingress..module-0", + "from-preload": true + }, + "request-information": { + "request-id": "051f3665-002c-4e3c-b62e-f8c0b48ef12e", + "request-action": "CreateVfModuleInstance", + "source": "MSO" + }, + "vf-module-level-oper-status": { + "order-status": "Created", + "last-rpc-action": "activate" + } + } + } + ] + } + } + } + ] + } + }, + "service-status": { + "final-indicator": "Y", + "rpc-action": "activate", + "rpc-name": "vf-module-topology-operation", + "response-code": "200", + "response-timestamp": "2020-06-24T13:06:24.525Z", + "response-message": "", + "action": "CreateVfModuleInstance", + "request-status": "synccomplete" + } + } + ] + } +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1-servicestatus.json b/ms/gra/gra-app/src/test/resources/service1-servicestatus.json index ca763d3..9dae1fd 100644 --- a/ms/gra/gra-app/src/test/resources/service1-servicestatus.json +++ b/ms/gra/gra-app/src/test/resources/service1-servicestatus.json @@ -1,4 +1,5 @@ { + "service-status": { "final-indicator": "Y", "rpc-action": "activate", "rpc-name": "vf-module-topology-operation", @@ -7,4 +8,5 @@ "response-message": "", "action": "CreateVfModuleInstance", "request-status": "synccomplete" + } }
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1-vfmodule-item.json b/ms/gra/gra-app/src/test/resources/service1-vfmodule-item.json index 67e5b3c..095cc80 100644 --- a/ms/gra/gra-app/src/test/resources/service1-vfmodule-item.json +++ b/ms/gra/gra-app/src/test/resources/service1-vfmodule-item.json @@ -1,79 +1,81 @@ { - "vf-module-data": { - "vf-module-level-oper-status": { - "order-status": "PendingCreate", - "last-rpc-action": "assign" - }, - "request-information": { - "request-action": "CreateVfModuleInstance", - "source": "simulator", - "request-id": "c594915b-cd49-4276-8e6b-536caa5f5285" - }, - "sdnc-request-header": { - "svc-request-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", - "svc-action": "assign" - }, - "service-information": { - "onap-model-information": { - "model-name": "vcpesvc_vbng_0412a", - "model-version": "3.0", - "model-uuid": "12eb33fa-b221-4d87-939c-d808b5799a7c", - "model-invariant-uuid": "ead151e2-e18a-44fc-b6ac-3ae3d819dcd6" + "vf-module": { + "vf-module-data": { + "vf-module-level-oper-status": { + "order-status": "PendingCreate", + "last-rpc-action": "assign" }, - "subscription-service-type": "VIRTUAL USP", - "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3cac", - "global-customer-id": "cust123", - "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca" - }, - "vf-module-information": { - "onap-model-information": { - "model-name": "SmsfNc2578..smsf_base..module-0", - "model-version": "3", - "model-customization-uuid": "59ffe5ba-cfaf-4e83-a2f3-159522dcebac", - "model-uuid": "513cc9fc-fff5-4c46-9728-393437536c4d", - "model-invariant-uuid": "7ca7567c-f42c-4ed8-bcde-f8971b92d90a" + "request-information": { + "request-action": "CreateVfModuleInstance", + "source": "simulator", + "request-id": "c594915b-cd49-4276-8e6b-536caa5f5285" }, - "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d", - "from-preload": true, - "vf-module-type": "SmsfNc2578..smsf_base..module-0" - }, - "vf-module-request-input": { - "aic-cloud-region": "rdm61a", - "cloud-owner": "att-nc", - "tenant": "4714fe06cc24414c914c51ca0aa1bf84", - "vf-module-name": "vfmodule1", - "vf-module-input-parameters": {} - }, - "vnf-information": { - "onap-model-information": { - "model-name": "vcpevsp_vgmux_0412 ", - "model-version": "1.0", - "model-customization-uuid": "5724fcc8-2ae2-45ce-8d44-795092b85dee", - "model-uuid": "ba3b8981-9a9c-4945-92aa-486234ec321f", - "model-invariant-uuid": "b3dc6465-942c-42af-8464-2bf85b6e504b" + "sdnc-request-header": { + "svc-request-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "svc-action": "assign" }, - "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", - "vnf-name": "zrdm61asmsf01", - "vnf-type": "SMSF-NC2-578-SVC/SMSF-NC2-578" - }, - "vf-module-topology": { - "onap-model-information": { - "model-name": "SmsfNc2578..smsf_base..module-0", - "model-version": "3", - "model-customization-uuid": "59ffe5ba-cfaf-4e83-a2f3-159522dcebac", - "model-uuid": "513cc9fc-fff5-4c46-9728-393437536c4d", - "model-invariant-uuid": "7ca7567c-f42c-4ed8-bcde-f8971b92d90a" + "service-information": { + "onap-model-information": { + "model-name": "vcpesvc_vbng_0412a", + "model-version": "3.0", + "model-uuid": "12eb33fa-b221-4d87-939c-d808b5799a7c", + "model-invariant-uuid": "ead151e2-e18a-44fc-b6ac-3ae3d819dcd6" + }, + "subscription-service-type": "VIRTUAL USP", + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3cac", + "global-customer-id": "cust123", + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca" }, - "aic-cloud-region": "rdm61a", - "tenant": "4714fe06cc24414c914c51ca0aa1bf84", - "vf-module-topology-identifier": { - "vf-module-name": "vfmodule1", + "vf-module-information": { + "onap-model-information": { + "model-name": "SmsfNc2578..smsf_base..module-0", + "model-version": "3", + "model-customization-uuid": "59ffe5ba-cfaf-4e83-a2f3-159522dcebac", + "model-uuid": "513cc9fc-fff5-4c46-9728-393437536c4d", + "model-invariant-uuid": "7ca7567c-f42c-4ed8-bcde-f8971b92d90a" + }, "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d", + "from-preload": true, "vf-module-type": "SmsfNc2578..smsf_base..module-0" }, - "vf-module-parameters": {}, - "sdnc-generated-cloud-resources": true - } - }, - "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d" + "vf-module-request-input": { + "aic-cloud-region": "rdm61a", + "cloud-owner": "att-nc", + "tenant": "4714fe06cc24414c914c51ca0aa1bf84", + "vf-module-name": "vfmodule1", + "vf-module-input-parameters": {} + }, + "vnf-information": { + "onap-model-information": { + "model-name": "vcpevsp_vgmux_0412 ", + "model-version": "1.0", + "model-customization-uuid": "5724fcc8-2ae2-45ce-8d44-795092b85dee", + "model-uuid": "ba3b8981-9a9c-4945-92aa-486234ec321f", + "model-invariant-uuid": "b3dc6465-942c-42af-8464-2bf85b6e504b" + }, + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-name": "zrdm61asmsf01", + "vnf-type": "SMSF-NC2-578-SVC/SMSF-NC2-578" + }, + "vf-module-topology": { + "onap-model-information": { + "model-name": "SmsfNc2578..smsf_base..module-0", + "model-version": "3", + "model-customization-uuid": "59ffe5ba-cfaf-4e83-a2f3-159522dcebac", + "model-uuid": "513cc9fc-fff5-4c46-9728-393437536c4d", + "model-invariant-uuid": "7ca7567c-f42c-4ed8-bcde-f8971b92d90a" + }, + "aic-cloud-region": "rdm61a", + "tenant": "4714fe06cc24414c914c51ca0aa1bf84", + "vf-module-topology-identifier": { + "vf-module-name": "vfmodule1", + "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d", + "vf-module-type": "SmsfNc2578..smsf_base..module-0" + }, + "vf-module-parameters": {}, + "sdnc-generated-cloud-resources": true + } + }, + "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d" + } }
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/service1.json b/ms/gra/gra-app/src/test/resources/service1.json index 00b9b4b..806af9c 100644 --- a/ms/gra/gra-app/src/test/resources/service1.json +++ b/ms/gra/gra-app/src/test/resources/service1.json @@ -232,5 +232,4 @@ } } ] -} - +}
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/vnf-level-oper-status.json b/ms/gra/gra-app/src/test/resources/vnf-level-oper-status.json index 1778cab..42e2583 100644 --- a/ms/gra/gra-app/src/test/resources/vnf-level-oper-status.json +++ b/ms/gra/gra-app/src/test/resources/vnf-level-oper-status.json @@ -1,5 +1,5 @@ { - "vnf-level-oper-status": { + "oper-status": { "create-timestamp": "string", "last-action": "CreateNetworkInstance", "last-order-status": "Active", diff --git a/ms/gra/gra-app/src/test/resources/vnf-vnf-networks-network-role.json b/ms/gra/gra-app/src/test/resources/vnf-vnf-networks-network-role.json index d435c4a..564adc9 100644 --- a/ms/gra/gra-app/src/test/resources/vnf-vnf-networks-network-role.json +++ b/ms/gra/gra-app/src/test/resources/vnf-vnf-networks-network-role.json @@ -1,34 +1,40 @@ { - "contrail-network-fqdn": "string", - "is-trunked": true, - "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", - "network-name": "test-network-name", - "network-role": "test-network-role", - "neutron-id": "812562dd-9d91-4ba6-9c3e-e52bf1cd4cc6", - "related-networks": { - "related-network": [{ - "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", - "network-role": "test-network-role", - "vlan-tags": { - "is-private": true, - "lower-tag-id": 0, - "upper-tag-id": 0, - "vlan-interface": "string" - } - }] - }, - "segmentation-id": "string", - "subnets-data": { - "subnet-data": [{ - "cidr-mask": "string", - "dhcp-enabled": "Y", - "gateway-address": "string", - "ip-version": "string", - "network-start-address": "string", - "sdnc-subnet-id": "string", - "subnet-id": "string", - "subnet-name": "string", - "subnet-role": "string" - }] + "vnf-network": { + "contrail-network-fqdn": "string", + "is-trunked": true, + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-name": "test-network-name", + "network-role": "test-network-role", + "neutron-id": "812562dd-9d91-4ba6-9c3e-e52bf1cd4cc6", + "related-networks": { + "related-network": [ + { + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-role": "test-network-role", + "vlan-tags": { + "is-private": true, + "lower-tag-id": 0, + "upper-tag-id": 0, + "vlan-interface": "string" + } + } + ] + }, + "segmentation-id": "string", + "subnets-data": { + "subnet-data": [ + { + "cidr-mask": "string", + "dhcp-enabled": "Y", + "gateway-address": "string", + "ip-version": "string", + "network-start-address": "string", + "sdnc-subnet-id": "string", + "subnet-id": "string", + "subnet-name": "string", + "subnet-role": "string" + } + ] + } } }
\ No newline at end of file diff --git a/ms/gra/gra-app/src/test/resources/vnf.json b/ms/gra/gra-app/src/test/resources/vnf.json new file mode 100644 index 0000000..84d1a45 --- /dev/null +++ b/ms/gra/gra-app/src/test/resources/vnf.json @@ -0,0 +1,603 @@ +{ + "vnf": { + "vnf-data": { + "request-information": { + "notification-url": "https://dev.null", + "order-number": "Order-123", + "order-version": "Order-v22", + "request-action": "CreateNetworkInstance", + "request-id": "a44e8401-2c62-47df-98be-9a09f6cbd996", + "source": "unit-test" + }, + "sdnc-request-header": { + "svc-action": "assign", + "svc-notification-url": "https://dev.null", + "svc-request-id": "9c06a7c6-be3a-4530-bdd8-c65b58f123a5" + }, + "service-information": { + "global-customer-id": "cust123", + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "subscriber-name": "unit-test", + "subscription-service-type": "unit-test" + }, + "vf-modules": { + "vf-module": [ + { + "vf-module-data": { + "request-information": { + "order-number": "Order-123", + "order-version": "Order-v22", + "request-action": "CreateNetworkInstance", + "request-id": "a44e8401-2c62-47df-98be-9a09f6cbd996", + "source": "unit-test" + }, + "sdnc-request-header": { + "svc-action": "assign", + "svc-request-id": "9c06a7c6-be3a-4530-bdd8-c65b58f123a5" + }, + "service-information": { + "global-customer-id": "cust123", + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "service-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "service-instance-id": "5c4f2d89-57a3-47e9-b49b-d3c63eb0b3ca", + "subscriber-name": "unit-test", + "subscription-service-type": "unit-test" + }, + "vf-module-information": { + "from-preload": true, + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d", + "vf-module-type": "some-vf-module-type" + }, + "vf-module-level-oper-status": { + "create-timestamp": "string", + "last-action": "CreateNetworkInstance", + "last-order-status": "Active", + "last-rpc-action": "assign", + "last-svc-request-id": "9c06a7c6-be3a-4530-bdd8-c65b58f123a5", + "modify-timestamp": "string", + "order-status": "Active" + }, + "vf-module-request-input": { + "aic-clli": "string", + "aic-cloud-region": "test-region", + "cloud-owner": "unit-test", + "request-version": "string", + "tenant": "string", + "vf-module-input-parameters": { + "param": [ + { + "name": "string", + "resource-resolution-data": { + "capability-name": "string", + "payload": "string", + "resource-key": [ + { + "name": "string", + "value": "string" + } + ], + "status": "string" + }, + "value": "string" + } + ] + }, + "vf-module-name": "string" + }, + "vf-module-topology": { + "aic-clli": "string", + "aic-cloud-region": "test-region", + "cloud-owner": "unit-test", + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "sdnc-generated-cloud-resources": true, + "tenant": "string", + "vf-module-assignments": { + "dhcp-subnet-assignments": { + "dhcp-subnet-assignment": [ + { + "ip-version": "string", + "network-role": "test-network-role", + "neutron-subnet-id": "string" + } + ] + }, + "vf-module-status": "string", + "vlan-vnfc-instance-groups": { + "vlan-vnfc-instance-group": [ + { + "instance-group-function": "string", + "instance-group-id": "string", + "vnf-id": "2a3bfc93-cd4c-4845-8919-434b2d999ada", + "vnfcs": { + "vnfc": [ + { + "vnfc-name": "string", + "vnic-groups": { + "vnic-group": [ + { + "network-instance-group-function": "string", + "vlan-assignment-policy-name": "string", + "vlan-common-ip-addresses": { + "ip-addresses": { + "ipv4-address": "string", + "ipv6-address": "string", + "vipv4-address": "string", + "vipv6-address": "string" + } + }, + "vlan-tag-index-next": 0, + "vlan-vnics": { + "vlan-vnic": [ + { + "vnic-port-id": "string", + "vnic-sub-interfaces": { + "sub-interface-network-data": [ + { + "floating-ips": { + "floating-ip-v4": [ + "string" + ], + "floating-ip-v6": [ + "string" + ] + }, + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-information-items": { + "network-information-item": [ + { + "ip-count": 0, + "ip-version": "string", + "network-ips": { + "network-ip": [ + "string" + ] + }, + "use-dhcp": "Y" + } + ] + }, + "network-name": 0, + "network-role": "test-network-role", + "network-role-tag": "string", + "neutron-network-id": "string", + "vlan-tag-id": 0 + } + ] + } + } + ] + }, + "vnic-interface-role": "string" + } + ] + } + } + ] + } + } + ] + }, + "vms": { + "vm": [ + { + "nfc-naming-code": "string", + "onap-model-information": { + "model-customization-uuid": "string", + "model-invariant-uuid": "string", + "model-name": "string", + "model-uuid": "string", + "model-version": "string" + }, + "vm-count": 0, + "vm-names": { + "vm-name": [ + "string" + ], + "vnfc-names": [ + { + "vnfc-name": "string", + "vnfc-networks": { + "vnfc-network-data": [ + { + "connection-point": { + "connection-point-id": "string", + "port-id": "string", + "vlan-data": [ + { + "vlan-role": "string", + "vlan-tag-description": "string", + "vlan-tag-id": "string", + "vlan-uuid": "string" + } + ] + }, + "vnfc-network-role": "string", + "vnfc-ports": { + "vnfc-port": [ + { + "common-sub-interface-role": "string", + "vnfc-port-id": "string", + "vnic-sub-interfaces": { + "sub-interface-network-data": [ + { + "floating-ips": { + "floating-ip-v4": [ + "string" + ], + "floating-ip-v6": [ + "string" + ] + }, + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-information-items": { + "network-information-item": [ + { + "ip-count": 0, + "ip-version": "string", + "network-ips": { + "network-ip": [ + "string" + ] + }, + "use-dhcp": "Y" + } + ] + }, + "network-name": 0, + "network-role": "test-network-role", + "network-role-tag": "string", + "neutron-network-id": "string", + "vlan-tag-id": 0 + } + ] + } + } + ] + }, + "vnfc-subnet": [ + { + "vnfc-ip-assignments": [ + { + "vnfc-address-family": "ipv4", + "vnfc-subnet-dhcp": "Y", + "vnfc-subnet-ip": [ + { + "ip-type": "FIXED", + "vnfc-client-key": "string", + "vnfc-ip-address": "string" + } + ], + "vnfc-subnet-ip-count": 0 + } + ], + "vnfc-subnet-role": "string" + } + ], + "vnfc-type": "string" + } + ] + } + } + ] + }, + "vm-networks": { + "vm-network": [ + { + "floating-ips": { + "floating-ip-v4": [ + "string" + ], + "floating-ip-v6": [ + "string" + ] + }, + "interface-route-prefixes": { + "interface-route-prefix": [ + "string" + ] + }, + "is-trunked": true, + "mac-addresses": { + "mac-address": [ + "string" + ] + }, + "network-information-items": { + "network-information-item": [ + { + "ip-count": 0, + "ip-version": "string", + "network-ips": { + "network-ip": [ + "string" + ] + }, + "use-dhcp": "Y" + } + ] + }, + "network-role": "test-network-role", + "network-role-tag": "string", + "related-networks": { + "related-network": [ + { + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-role": "test-network-role", + "vlan-tags": { + "is-private": true, + "lower-tag-id": 0, + "upper-tag-id": 0, + "vlan-interface": "string" + } + } + ] + }, + "segmentation-id": "string", + "sriov-parameters": { + "application-tags": { + "c-tags": { + "c-tag": [ + "string" + ], + "ctag": [ + "string" + ] + }, + "ctags": { + "c-tag": [ + "string" + ], + "ctag": [ + "string" + ] + }, + "s-tags": { + "s-tag": [ + "string" + ], + "stag": [ + "string" + ] + }, + "stags": { + "s-tag": [ + "string" + ], + "stag": [ + "string" + ] + } + }, + "heat-vlan-filters": { + "heat-vlan-filter": [ + "string" + ] + } + } + } + ] + }, + "vm-type": "string", + "vm-type-tag": "string" + } + ] + } + }, + "vf-module-parameters": { + "param": [ + { + "name": "string", + "resource-resolution-data": { + "capability-name": "string", + "payload": "string", + "resource-key": [ + { + "name": "string", + "value": "string" + } + ], + "status": "string" + }, + "value": "string" + } + ] + }, + "vf-module-topology-identifier": { + "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d", + "vf-module-name": "some-vf-module-name", + "vf-module-type": "some-vf-module-type" + } + }, + "vnf-information": { + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-name": "mytestvnf", + "vnf-type": "SMSF-NC2-578-SVC/SMSF-NC2-578" + } + }, + "vf-module-id": "45841173-3729-4a1d-a811-a3bde399e22d" + } + ] + }, + "vnf-information": { + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-name": "mytestvnf", + "vnf-type": "SMSF-NC2-578-SVC/SMSF-NC2-578" + }, + "vnf-level-oper-status": { + "create-timestamp": "string", + "last-action": "CreateNetworkInstance", + "last-order-status": "Active", + "last-rpc-action": "assign", + "last-svc-request-id": "9c06a7c6-be3a-4530-bdd8-c65b58f123a5", + "modify-timestamp": "string", + "order-status": "Active" + }, + "vnf-request-input": { + "aic-clli": "string", + "aic-cloud-region": "test-region", + "cloud-owner": "unit-test", + "request-version": "string", + "tenant": "string", + "vnf-name": "mytestvnf", + "vnf-networks": { + "vnf-network": [ + { + "contrail-network-fqdn": "string", + "is-trunked": true, + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-name": "test-network-name", + "network-role": "test-network-role", + "neutron-id": "812562dd-9d91-4ba6-9c3e-e52bf1cd4cc6", + "related-networks": { + "related-network": [ + { + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-role": "test-network-role", + "vlan-tags": { + "is-private": true, + "lower-tag-id": 0, + "upper-tag-id": 0, + "vlan-interface": "string" + } + } + ] + }, + "segmentation-id": "string", + "subnets-data": { + "subnet-data": [ + { + "cidr-mask": "string", + "dhcp-enabled": "Y", + "gateway-address": "string", + "ip-version": "string", + "network-start-address": "string", + "sdnc-subnet-id": "string", + "subnet-id": "string", + "subnet-name": "string", + "subnet-role": "string" + } + ] + } + } + ] + } + }, + "vnf-topology": { + "aic-clli": "string", + "aic-cloud-region": "test-region", + "cloud-owner": "unit-test", + "onap-model-information": { + "model-customization-uuid": "602c6bcc-6cfa-41cb-a8a7-968b38d5935f", + "model-invariant-uuid": "bdb4f943-c9be-4742-b976-a34607f3687e", + "model-name": "SMSF-NC2-578", + "model-uuid": "86c76b5d-fa8d-4034-b79a-1cc4326021a9", + "model-version": "3.0" + }, + "sdnc-generated-cloud-resources": true, + "tenant": "string", + "vnf-resource-assignments": { + "availability-zones": { + "availability-zone": [ + "string" + ], + "max-count": 0 + }, + "vnf-networks": { + "vnf-network": [ + { + "contrail-network-fqdn": "string", + "is-trunked": true, + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-name": "test-network-name", + "network-role": "test-network-role", + "neutron-id": "812562dd-9d91-4ba6-9c3e-e52bf1cd4cc6", + "related-networks": { + "related-network": [ + { + "network-id": "69f09279-8af1-4475-83cf-7e357c579dbf", + "network-role": "test-network-role", + "vlan-tags": { + "is-private": true, + "lower-tag-id": 0, + "upper-tag-id": 0, + "vlan-interface": "string" + } + } + ] + }, + "segmentation-id": "string", + "subnets-data": { + "subnet-data": [ + { + "cidr-mask": "string", + "dhcp-enabled": "Y", + "gateway-address": "string", + "ip-version": "string", + "network-start-address": "string", + "sdnc-subnet-id": "string", + "subnet-id": "string", + "subnet-name": "string", + "subnet-role": "string" + } + ] + } + } + ] + }, + "vnf-status": "string" + }, + "vnf-topology-identifier-structure": { + "nf-code": "string", + "nf-function": "string", + "nf-role": "string", + "nf-type": "string", + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4", + "vnf-name": "mytestvnf", + "vnf-type": "SMSF-NC2-578-SVC/SMSF-NC2-578" + } + } + }, + "vnf-id": "fae319cc-68d6-496f-be1e-a09e133c71d4" + } +}
\ No newline at end of file |