diff options
| -rw-r--r-- | config/sdncgenericresource.spec | 54 | ||||
| -rw-r--r-- | src/test/resources/junit/sdncGenericResponse.json | 183 |
2 files changed, 217 insertions, 20 deletions
diff --git a/config/sdncgenericresource.spec b/config/sdncgenericresource.spec index a3883e4..c8a8ffc 100644 --- a/config/sdncgenericresource.spec +++ b/config/sdncgenericresource.spec @@ -49,27 +49,34 @@ "vms": { "vm": { "*": { - "vm-type": "vfList[&11].vfModuleList[&7].vmList[&1].nfNamingCode", "vm-names": { "vm-name": { - "*": "vfList[&13].vfModuleList[&9].vmList[&3].name" + "*": { + "@": "vfList[&14].vfModuleList[&10].vmList[&1].name", + "@(3,vm-type)": "vfList[&14].vfModuleList[&10].vmList[&1].nfNamingCode", + "@(3,inMaint)": { + "#lockedBoolean": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[0].name", + "yes": { + "#true": "vfList[&16].vfModuleList[&12].vmList[&3].attributeList[0].value" + }, + "no": { + "#false": "vfList[&16].vfModuleList[&12].vmList[&3].attributeList[0].value" + } + }, + "@(3,prov-status)": { + "#provStatus": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[1].name", + "@(4,prov-status)": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[1].value" + }, + "@(3,pserver)": { + "#hostName": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[2].name", + "hostname": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[2].value" + }, + "@(3,image)": { + "#imageId": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[3].name", + "image-name": "vfList[&15].vfModuleList[&11].vmList[&2].attributeList[3].value" + } + } } - }, - "inMaint": { - "#lockedBoolean": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[0].name", - "@(1,inMaint)": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[0].value" - }, - "prov-status": { - "#provStatus": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[1].name", - "@(1,prov-status)": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[1].value" - }, - "pserver": { - "#hostName": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[2].name", - "hostname": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[2].value" - }, - "image": { - "#imageId": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[3].name", - "image-name": "vfList[&12].vfModuleList[&8].vmList[&2].attributeList[3].value" } } } @@ -95,7 +102,16 @@ }, "network-topology-identifier-structure": { "network-type": "vfList[0].vfModuleList[0].networkList[&4].type", - "network-name": "vfList[0].vfModuleList[0].networkList[&4].name" + "network-name": "vfList[0].vfModuleList[0].networkList[&4].name", + "isShared": { + "#sharedNetworkBoolean": "vfList[0].vfModuleList[0].networkList[&5].attributeList[0].name", + "yes": { + "#true": "vfList[0].vfModuleList[0].networkList[&6].attributeList[0].value" + }, + "no": { + "#false": "vfList[0].vfModuleList[0].networkList[&6].attributeList[0].value" + } + } } } } diff --git a/src/test/resources/junit/sdncGenericResponse.json b/src/test/resources/junit/sdncGenericResponse.json index 27b791a..edd7d82 100644 --- a/src/test/resources/junit/sdncGenericResponse.json +++ b/src/test/resources/junit/sdncGenericResponse.json @@ -1 +1,182 @@ -{"service":[{"service-instance-id":"7d518257-49bd-40ac-8d17-017a726ec12a","service-status":{"final-indicator":"Y","rpc-action":"assign","rpc-name":"vf-module-topology-operation","response-code":"200","response-timestamp":"2018-08-27T01:58:25.652Z","action":"CreateVfModuleInstance","response-message":"","request-status":"synccomplete"},"service-data":{"service-request-input":{"service-instance-name":"vfw_svc_vfwsvc_rescust_0822a_201808262153","service-input-parameters":{"param":[{"name":"BRG_WAN_MAC_Address","value":"fa:16:3e:79:24:0e"},{"name":"customerLongitude","value":"-97.040443"},{"name":"customerLatitude","value":"32.897480"},{"name":"Homing_Solution","value":"sniro"},{"name":"customerName","value":"some_company"}]}},"service-information":{"service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","onap-model-information":{"model-invariant-uuid":"3a4e6986-5c5e-434e-b0be-8d718107fa83","model-name":"vfwsvc_rescust_0822a","model-version":"1.0","model-uuid":"209efacc-54d4-4f12-9064-099d47c36a29"},"service-instance-id":"7d518257-49bd-40ac-8d17-017a726ec12a","global-customer-id":"SDN-ETHERNET-INTERNET","subscription-service-type":"vFW"},"service-topology":{"service-topology-identifier":{"service-instance-id":"7d518257-49bd-40ac-8d17-017a726ec12a","service-instance-name":"vfw_svc_vfwsvc_rescust_0822a_201808262153","global-customer-id":"SDN-ETHERNET-INTERNET","service-type":"vFW"},"onap-model-information":{"model-invariant-uuid":"3a4e6986-5c5e-434e-b0be-8d718107fa83","model-name":"vfwsvc_rescust_0822a","model-version":"1.0","model-uuid":"209efacc-54d4-4f12-9064-099d47c36a29"}},"sdnc-request-header":{"svc-action":"assign","svc-request-id":"dd3dffc8-6a15-4f7f-9787-d835ee247283","svc-notification-url":"http://c1.vm1.mso.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify"},"request-information":{"request-id":"2a950a5c-21bf-4496-a592-b51f45719603","request-action":"CreateServiceInstance","source":"MSO"},"vnfs":{"vnf":[{"vnf-id":"bf2a200d-744f-4900-afc4-d5ef44638467","vnf-data":{"vf-modules":{"vf-module":[{"vf-module-id":"815e8636-5c2a-41ad-b24d-17c824106bd2","vf-module-data":{"service-information":{"service-id":"null","onap-model-information":{"model-invariant-uuid":"3a4e6986-5c5e-434e-b0be-8d718107fa83","model-name":"vfwsvc_rescust_0822a","model-version":"1.0","model-uuid":"209efacc-54d4-4f12-9064-099d47c36a29"},"service-instance-id":"7d518257-49bd-40ac-8d17-017a726ec12a","global-customer-id":"SDN-ETHERNET-INTERNET","subscription-service-type":"null"},"vf-module-topology":{"onap-model-information":{"model-invariant-uuid":"7e91451d-e320-4755-a1a8-fcf140b86779","model-name":"VfwvspVgw0822a..base_vfw_vgw..module-0","model-version":"1","model-customization-uuid":"7fbb59b7-a7ac-4fa6-b0bc-42f47339010a","model-uuid":"1908874e-cfae-4ee1-93b9-f4ba46b460ff"},"vf-module-parameters":{"param":[{"name":"mux_ip_addr","value":"10.5.0.21"},{"name":"mux_gw_private_net_id","value":"vfw_net_mux_gw_201808231522"},{"name":"vg_vgmux_tunnel_vni","value":"107"},{"name":"repo_url_artifacts","value":"https://nexus.onap.org/content/groups/staging"},{"name":"cpe_public_net_id","value":"vfw_net_cpe_public_201808231522"},{"name":"key_name","value":"vgw_key"},{"name":"onap_private_subnet_id","value":"oam_onap_1MdY"},{"name":"cpe_public_net_cidr","value":"10.2.0.0/24"},{"name":"mux_gw_private_net_cidr","value":"10.5.0.0/24"},{"name":"cloud_env","value":"openstack"},{"name":"cpe_public_subnet_id","value":"vfw_net_cpe_public_subnet_201808231522"},{"name":"mux_gw_private_subnet_id","value":"vfw_net_mux_gw_subnet_201808231522"},{"name":"onap_private_net_id","value":"oam_onap_1MdY"},{"name":"repo_url_blob","value":"https://nexus.onap.org/content/sites/raw"},{"name":"install_script_version","value":"1.1.1"},{"name":"demo_artifacts_version","value":"1.1.1"},{"name":"vgw_name_0","value":"zdcpe1cpe01gw01_201808261550"},{"name":"vgw_private_ip_1","value":"10.0.101.99"},{"name":"vgw_private_ip_0","value":"10.5.0.107"},{"name":"public_net_id","value":"971040b2-7059-49dc-b220-4fab50cb2ad4"},{"name":"vgw_private_ip_2","value":"10.2.0.6"},{"name":"onap_private_net_cidr","value":"10.0.0.0/16"},{"name":"pub_key","value":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"}]},"tenant":"7fad299815104c0a8f90a8df80343f03","aic-clli":"clli1","aic-cloud-region":"RegionOne","vf-module-topology-identifier":{"vf-module-id":"815e8636-5c2a-41ad-b24d-17c824106bd2","vf-module-name":"zRegionOne06_base_vfw_vgw_0","vf-module-type":"VfwvspVgw0822a..base_vfw_vgw..module-0"},"vf-module-assignments":{"vms":{"vm":[{"vm-type":"vgw","vm-count":1,"vm-type-tag":"vgw","vm-names":{"vm-name":["zRegionOne06001"]}}]}}},"vf-module-request-input":{"vf-module-name":"zRegionOne06_base_vfw_vgw_0","tenant":"7fad299815104c0a8f90a8df80343f03","aic-cloud-region":"RegionOne"},"vf-module-information":{"onap-model-information":{"model-invariant-uuid":"7e91451d-e320-4755-a1a8-fcf140b86779","model-name":"VfwvspVgw0822a..base_vfw_vgw..module-0","model-version":"1","model-customization-uuid":"7fbb59b7-a7ac-4fa6-b0bc-42f47339010a","model-uuid":"1908874e-cfae-4ee1-93b9-f4ba46b460ff"},"vf-module-id":"815e8636-5c2a-41ad-b24d-17c824106bd2","vf-module-type":"VfwvspVgw0822a..base_vfw_vgw..module-0"},"sdnc-request-header":{"svc-action":"assign","svc-request-id":"2a950a5c-21bf-4496-a592-b51f45719603-1535335110722","svc-notification-url":"http://c1.vm1.mso.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify"},"vnf-information":{"vnf-id":"bf2a200d-744f-4900-afc4-d5ef44638467","vnf-type":"vfwsvc_rescust_0822a/vfwvsp_vgw_0822a 0","onap-model-information":{"model-invariant-uuid":"71370375-e1b4-4ad2-9832-1b7877428c81","model-name":"vfwvsp_vgw_0822a","model-version":"1.0","model-customization-uuid":"d4484d8e-09c8-4e1e-89f7-b556bf7c57ba","model-uuid":"7dd31559-9fc6-4b0d-bbe3-7ba641bf8a9b"}},"request-information":{"request-id":"2a950a5c-21bf-4496-a592-b51f45719603","request-action":"CreateVfModuleInstance","source":"VID"},"vf-module-level-oper-status":{"order-status":"PendingCreate","last-rpc-action":"assign"}}}]},"vnf-level-oper-status":{"last-rpc-action":"activate","order-status":"Created","last-action":"CreateVnfInstance"},"service-information":{"service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","onap-model-information":{"model-invariant-uuid":"3a4e6986-5c5e-434e-b0be-8d718107fa83","model-name":"vfwsvc_rescust_0822a","model-version":"1.0","model-uuid":"209efacc-54d4-4f12-9064-099d47c36a29"},"service-instance-id":"7d518257-49bd-40ac-8d17-017a726ec12a","global-customer-id":"SDN-ETHERNET-INTERNET","subscription-service-type":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"},"sdnc-request-header":{"svc-action":"activate","svc-request-id":"2a950a5c-21bf-4496-a592-b51f45719603-1535335104196","svc-notification-url":"http://c1.vm1.mso.simpledemo.openecomp.org:8080/adapters/rest/SDNCNotify"},"vnf-information":{"vnf-id":"bf2a200d-744f-4900-afc4-d5ef44638467","vnf-type":"vfwsvc_rescust_0822a/vfwvsp_vgw_0822a 0","onap-model-information":{"model-invariant-uuid":"71370375-e1b4-4ad2-9832-1b7877428c81","model-name":"vfwvsp_vgw_0822a","model-version":"1.0","model-customization-uuid":"d4484d8e-09c8-4e1e-89f7-b556bf7c57ba","model-uuid":"7dd31559-9fc6-4b0d-bbe3-7ba641bf8a9b"}},"request-information":{"request-id":"2a950a5c-21bf-4496-a592-b51f45719603","request-action":"CreateVnfInstance","source":"VID"},"vnf-request-input":{"vnf-name":"zRegionOne06","tenant":"7fad299815104c0a8f90a8df80343f03","aic-cloud-region":"RegionOne"},"vnf-topology":{"onap-model-information":{"model-invariant-uuid":"71370375-e1b4-4ad2-9832-1b7877428c81","model-name":"vfwvsp_vgw_0822a","model-version":"1.0","model-customization-uuid":"d4484d8e-09c8-4e1e-89f7-b556bf7c57ba","model-uuid":"7dd31559-9fc6-4b0d-bbe3-7ba641bf8a9b"},"tenant":"7fad299815104c0a8f90a8df80343f03","aic-clli":"clli1","aic-cloud-region":"RegionOne","vnf-topology-identifier-structure":{"vnf-id":"bf2a200d-744f-4900-afc4-d5ef44638467","vnf-type":"vfwsvc_rescust_0822a/vfwvsp_vgw_0822a 0","vnf-name":"zRegionOne06"},"vnf-resource-assignments":{"availability-zones":{"availability-zone":["nova"],"max-count":1}}}}}]},"service-level-oper-status":{"last-rpc-action":"assign","order-status":"Created","last-action":"CreateServiceInstance"}}}]}
+{ + "service": [ + { + "service-instance-id": "b06270ab-99e6-4a58-9bc0-db2df5c36f4d", + "service-data": { + "service-information": { + "service-instance-id": "b06270ab-99e6-4a58-9bc0-db2df5c36f4d", + "global-customer-id": "notsurewecare", + "subscription-service-type": "null", + "service-id": "null" + }, + "service-level-oper-status": { + "order-status": "Created" + }, + "service-topology": { + "service-topology-identifier": { + "service-instance-id": "b06270ab-99e6-4a58-9bc0-db2df5c36f4d", + "global-customer-id": "notsurewecare", + "service-type": "null", + "service-id": "null" + } + }, + "vnfs": { + "vnf": [ + { + "vnf-id": "1239053c-1322-42f2-a425-5fd34536dd98", + "vnf-data": { + "vnf-level-oper-status": { + "order-status": "Created" + }, + "service-information": { + "service-instance-id": "b06270ab-99e6-4a58-9bc0-db2df5c36f4d", + "global-customer-id": "notsurewecare", + "subscription-service-type": "null", + "service-id": "null" + }, + "vnf-topology": { + "tenant": "d0a030fc9fd942c88d8bbb3165c96456", + "vnf-topology-identifier-structure": { + "vnf-id": "1239053c-1322-42f2-a425-5fd34536dd98", + "vnf-type": "mDNS_Preload_1802_0108/mDNS_Preload_1802_0108 0", + "vnf-name": "mDNS_Preload_1802_0108_rk_01" + }, + "vnf-resource-assignments": { + "vnf-networks": {} + }, + "aic-cloud-region": "mtn23a" + }, + "vnf-information": { + "vnf-id": "1239053c-1322-42f2-a425-5fd34536dd98", + "vnf-type": "mDNS_Preload_1802_0108/mDNS_Preload_1802_0108 0", + "vnf-name": "mDNS_Preload_1802_0108_rk_01" + }, + "vnf-request-input": { + "tenant": "d0a030fc9fd942c88d8bbb3165c96456", + "aic-cloud-region": "mtn23a", + "vnf-name": "mDNS_Preload_1802_0108_rk_01" + }, + "vf-modules": { + "vf-module": [ + { + "vf-module-id": "c3cae358-5479-4fdf-b3fb-7f51e87b40ca", + "vf-module-data": { + "service-information": { + "service-instance-id": "b06270ab-99e6-4a58-9bc0-db2df5c36f4d", + "global-customer-id": "notsurewecare", + "subscription-service-type": "null", + "service-id": "null" + }, + "vf-module-level-oper-status": { + "order-status": "Created" + }, + "vf-module-topology": { + "tenant": "d0a030fc9fd942c88d8bbb3165c96456", + "aic-cloud-region": "mtn23a", + "vf-module-topology-identifier": { + "vf-module-type": "MdnsPreload18020108..dns_az_01..module-1", + "vf-module-id": "c3cae358-5479-4fdf-b3fb-7f51e87b40ca", + "vf-module-name": "zmtn23amdns04cmd001" + }, + "vf-module-assignments": { + "vms": { + "vm": [ + { + "vm-type": "dns", + "vm-count": 4, + "inMaint": "no", + "pserver": { + "hostname": "somerandomserver.ottawa.com" + }, + "image": { + "image-name": "cfad8f38-3d4c-4aec-8bd4-f83ad605acbe" + }, + "prov-status": "Available", + "vm-names": { + "vnfc-names": [ + { + "vnfc-name": "mDNS_Preload_1802_0108_rk_01dns012" + } + ], + "vm-name": [ + "mDNS_Preload_1802_0108_rk_01dns009", + "mDNS_Preload_1802_0108_rk_01dns010", + "mDNS_Preload_1802_0108_rk_01dns011", + "mDNS_Preload_1802_0108_rk_01dns012" + ] + } + } + ] + } + }, + "vf-module-parameters": {}, + "onap-model-information": { + "model-customization-uuid": "912b0ae5-1dd3-417c-b95a-9ed7d5a13ef4" + } + }, + "vf-module-request-input": { + "tenant": "d0a030fc9fd942c88d8bbb3165c96456", + "aic-cloud-region": "mtn23a", + "vf-module-name": "zmtn23amdns04cmd001" + }, + "vf-module-information": { + "vf-module-type": "MdnsPreload18020108..dns_az_01..module-1", + "from-preload": false + }, + "vnf-information": { + "vnf-id": "1239053c-1322-42f2-a425-5fd34536dd98", + "vnf-type": "mDNS_Preload_1802_0108/mDNS_Preload_1802_0108 0" + } + } + }, + { + "vf-module-id": "b8cc44e1-fb99-4df4-898a-1ef14a6f4b2b", + "vf-module-data": { + "service-information": { + "service-instance-id": "b06270ab-99e6-4a58-9bc0-db2df5c36f4d", + "global-customer-id": "notsurewecare", + "subscription-service-type": "null", + "service-id": "null" + }, + "vf-module-level-oper-status": { + "order-status": "Created" + }, + "vf-module-topology": { + "tenant": "d0a030fc9fd942c88d8bbb3165c96456", + "aic-cloud-region": "mtn23a", + "vf-module-topology-identifier": { + "vf-module-type": "MdnsPreload18020108..base_dns..module-0", + "vf-module-id": "b8cc44e1-fb99-4df4-898a-1ef14a6f4b2b", + "vf-module-name": "zmtn23amdns04cmd001_base" + }, + "vf-module-assignments": {}, + "vf-module-parameters": {}, + "onap-model-information": { + "model-customization-uuid": "29af7474-5859-49e9-8947-48d1662c52d4" + } + }, + "vf-module-request-input": { + "tenant": "d0a030fc9fd942c88d8bbb3165c96456", + "aic-cloud-region": "mtn23a", + "vf-module-name": "zmtn23amdns04cmd001_base" + }, + "vf-module-information": { + "vf-module-type": "MdnsPreload18020108..base_dns..module-0", + "from-preload": false + }, + "vnf-information": { + "vnf-id": "1239053c-1322-42f2-a425-5fd34536dd98", + "vnf-type": "mDNS_Preload_1802_0108/mDNS_Preload_1802_0108 0" + } + } + } + ] + } + } + } + ] + } + } + } + ] +}
\ No newline at end of file |