From 3bd680abb92842e4495c0b15b2bf9f9a4d6af349 Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 8 Nov 2017 11:48:11 +0530 Subject: [PATCH] Changed E2eservice CSIT request json IssueId : SO-317 Change-Id: I2230f110babe037ff5a15dbd8788635e8464f365 Signed-off-by: seshukm --- .../so/sanity-check/data/createE2eservice.json | 126 ++++++++++++++++----- .../so/sanity-check/data/deleteE2eservice.json | 30 +---- 2 files changed, 100 insertions(+), 56 deletions(-) diff --git a/test/csit/tests/so/sanity-check/data/createE2eservice.json b/test/csit/tests/so/sanity-check/data/createE2eservice.json index b24cc9c28..b8bac167e 100644 --- a/test/csit/tests/so/sanity-check/data/createE2eservice.json +++ b/test/csit/tests/so/sanity-check/data/createE2eservice.json @@ -1,30 +1,100 @@ { - "service": { - "name": "service", - "description": "so_test1", - "serviceDefId": "182834434345", - "templateId": "5994888392", - "parameters": { - "domainHost": "127.0.0.1", - "nodeTemplateName": "model:v3", - "nodeType": "service", - "globalSubscriberId": "49923893499", - "subscriberName": "NEED THIS UUI - AAI", - "requestParameters": { - "subscriptionServiceType": "MOG", - "userParams": [ - { - "name": "someUserParam", - "value": "someValue" - }, - { - "name": "segments", - "value": "[\n{\n\"domainHost\":\"localhost\",\n\"nodeTemplateName\":\"IMS_NS\",\n\"nodeType\":\"tosca.nodes.nfv.NS.IMS\",\n\"segments\":[\n\n],\n\"nsParameters\":{\n\"locationConstraints\":[\n{\n\"vnfProfileId\":\"zte-CSCF-1.0\",\n\"locationConstraints\":{\n\"vimId\":\"4050083f-465f-4838-af1e-47a545222ad0\"\n}\n}\n],\n\"additionalParamForNs\":{\n\"externalDataNetworkName\":\"Flow_out_net\",\n\"m6000_mng_ip\":\"181.18.20.2\",\n\"externalCompanyFtpDataNetworkName\":\"Flow_out_net\",\n\"externalPluginManageNetworkName\":\"plugin_net_2014\",\n\"externalManageNetworkName\":\"mng_net_2017\",\n\"sfc_data_network\":\"sfc_data_net_2016\",\n\"NatIpRange\":\"210.1.1.10-210.1.1.20\",\n\"location\":\"4050083f-465f-4838-af1e-47a545222ad0\",\n\"sdncontroller\":\"9b9f02c0-298b-458a-bc9c-be3692e4f35e\"\n}\n}\n},\n{\n\"domainHost\":\"localhost\",\n\"nodeTemplateName\":\"EPC_NS\",\n\"nodeType\":\"tosca.nodes.nfv.NS.IMS\",\n\"segments\":[\n\n],\n\"nsParameters\":{\n\"locationConstraints\":[\n{\n\"vnfProfileId\":\"zte-CSCF-1.0\",\n\"locationConstraints\":{\n\"vimId\":\"4050083f-465f-4838-af1e-47a545222ad0\"\n}\n}\n],\n\"additionalParamForNs\":{\n\"externalDataNetworkName\":\"Flow_out_net\",\n\"m6000_mng_ip\":\"181.18.20.2\",\n\"externalCompanyFtpDataNetworkName\":\"Flow_out_net\",\n\"externalPluginManageNetworkName\":\"plugin_net_2014\",\n\"externalManageNetworkName\":\"mng_net_2017\",\n\"sfc_data_network\":\"sfc_data_net_2016\",\n\"NatIpRange\":\"210.1.1.10-210.1.1.20\",\n\"location\":\"4050083f-465f-4838-af1e-47a545222ad0\",\n\"sdncontroller\":\"9b9f02c0-298b-458a-bc9c-be3692e4f35e\"\n}\n}\n}\n]" - }, - { - "name": "nsParameters", - "value": "{\n \"locationConstraints\": {},\n \"additionalParamForNs\": {\n \"E2EServcie.param1\": \"value1\",\n \"E2EServcie.param2\": \"value2\"\n }\n }" - } - ] - }}} + "service":{ +"name":"so_test5", +"description":"so_test2", + "serviceDefId":"60c3e96e-0970-4871-b6e0-3b6de7561519", +"templateId":"592f9437-a9c0-4303-b9f6-c445bb7e9814", + "parameters":{ + "globalSubscriberId":"123457", + "subscriberName":"Customer1", + "serviceType":"voLTE", +"templateName":"voLTE Service:1.0", + "resources":[ + { +"resourceName":"vIMS", + "resourceDefId":"60c3e96e-0970-4871-b6e0-3b6de7561516", + "resourceId":"60c3e96e-0970-4871-b6e0-3b6de7561512", +"nsParameters":{ + "locationConstraints":[ + { +"vnfProfileId":"zte-vBAS-1.0", + "locationConstraints":{ + "vimId":"4050083f-465f-4838-af1e-47a545222ad0" + } +}, + { + "vnfProfileId":"zte-vMME-1.0", + "locationConstraints":{ + "vimId":"4050083f-465f-4838-af1e-47a545222ad0" + } + } + ], + "additionalParamForNs":{ + + } +} + }, + { + "resourceName":"vEPC", + "resourceDefId":"61c3e96e-0970-4871-b6e0-3b6de7561516", + "resourceId":"62c3e96e-0970-4871-b6e0-3b6de7561512", + "nsParameters":{ +"locationConstraints":[ + { +"vnfProfileId":"zte-CSCF-1.0", +"locationConstraints":{ + "vimId":"4050083f-465f-4838-af1e-47a545222ad1" +} + } + ], +"additionalParamForNs":{ + + } + } + }, + { + "resourceName":"underlayvpn", +"resourceDefId":"60c3e96e-0970-4871-b6e0-3b6de7561513", + "resourceId":"60c3e96e-0970-4871-b6e0-3b6de7561514", +"nsParameters":{ +"locationConstraints":[ + + ], +"additionalParamForNs":{ + "externalDataNetworkName":"Flow_out_net", +"m6000_mng_ip":"181.18.20.2", + "externalCompanyFtpDataNetworkName":"Flow_out_net", + "externalPluginManageNetworkName":"plugin_net_2014", + "externalManageNetworkName":"mng_net_2017", + "sfc_data_network":"sfc_data_net_2016", +"NatIpRange":"210.1.1.10-210.1.1.20", +"location":"4050083f-465f-4838-af1e-47a545222ad0", + "sdncontroller":"9b9f02c0-298b-458a-bc9c-be3692e4f35e" + } + } + }, + { + "resourceName":"overlayvpn", + "resourceDefId":"60c3e96e-0970-4871-b6e0-3b6de7561517", + "resourceId":"60c3e96e-0970-4871-b6e0-3b6de7561518", +"nsParameters":{ + "locationConstraints":[ + + ], + "additionalParamForNs":{ +"externalDataNetworkName":"Flow_out_net", + "m6000_mng_ip":"181.18.20.2", + "externalCompanyFtpDataNetworkName":"Flow_out_net", + "externalPluginManageNetworkName":"plugin_net_2014", + "externalManageNetworkName":"mng_net_2017", + "sfc_data_network":"sfc_data_net_2016", +"NatIpRange":"210.1.1.10-210.1.1.20", +"location":"4050083f-465f-4838-af1e-47a545222ad0", + "sdncontroller":"9b9f02c0-298b-458a-bc9c-be3692e4f35e" +} + } +} + ] +} +} } \ No newline at end of file diff --git a/test/csit/tests/so/sanity-check/data/deleteE2eservice.json b/test/csit/tests/so/sanity-check/data/deleteE2eservice.json index f5a87b1d3..d423dc34f 100644 --- a/test/csit/tests/so/sanity-check/data/deleteE2eservice.json +++ b/test/csit/tests/so/sanity-check/data/deleteE2eservice.json @@ -1,30 +1,4 @@ { - "service": { - "name": "instanceName", - "description": "so_test1", - "serviceDefId": "modelInvariantId value from SDC?", - "templateId": "modelVersionId value from SDC??", - "parameters": { - "domainHost": "localhost", - "nodeTemplateName": "modelName+:+modelVersion", - "nodeType": "modelType?? == service", - "globalSubscriberId": "NEED THIS UUI - AAI", - "subscriberName": "NEED THIS UUI - AAI", - "requestParameters": { - "subscriptionServiceType": "MOG", - "userParams": [ - { - "name": "someUserParam", - "value": "someValue" - }, - { - "name": "segments", - "value": "[\n{\n\"domainHost\":\"localhost\",\n\"nodeTemplateName\":\"IMS_NS\",\n\"nodeType\":\"tosca.nodes.nfv.NS.IMS\",\n\"segments\":[\n\n],\n\"nsParameters\":{\n\"locationConstraints\":[\n{\n\"vnfProfileId\":\"zte-CSCF-1.0\",\n\"locationConstraints\":{\n\"vimId\":\"4050083f-465f-4838-af1e-47a545222ad0\"\n}\n}\n],\n\"additionalParamForNs\":{\n\"externalDataNetworkName\":\"Flow_out_net\",\n\"m6000_mng_ip\":\"181.18.20.2\",\n\"externalCompanyFtpDataNetworkName\":\"Flow_out_net\",\n\"externalPluginManageNetworkName\":\"plugin_net_2014\",\n\"externalManageNetworkName\":\"mng_net_2017\",\n\"sfc_data_network\":\"sfc_data_net_2016\",\n\"NatIpRange\":\"210.1.1.10-210.1.1.20\",\n\"location\":\"4050083f-465f-4838-af1e-47a545222ad0\",\n\"sdncontroller\":\"9b9f02c0-298b-458a-bc9c-be3692e4f35e\"\n}\n}\n},\n{\n\"domainHost\":\"localhost\",\n\"nodeTemplateName\":\"EPC_NS\",\n\"nodeType\":\"tosca.nodes.nfv.NS.IMS\",\n\"segments\":[\n\n],\n\"nsParameters\":{\n\"locationConstraints\":[\n{\n\"vnfProfileId\":\"zte-CSCF-1.0\",\n\"locationConstraints\":{\n\"vimId\":\"4050083f-465f-4838-af1e-47a545222ad0\"\n}\n}\n],\n\"additionalParamForNs\":{\n\"externalDataNetworkName\":\"Flow_out_net\",\n\"m6000_mng_ip\":\"181.18.20.2\",\n\"externalCompanyFtpDataNetworkName\":\"Flow_out_net\",\n\"externalPluginManageNetworkName\":\"plugin_net_2014\",\n\"externalManageNetworkName\":\"mng_net_2017\",\n\"sfc_data_network\":\"sfc_data_net_2016\",\n\"NatIpRange\":\"210.1.1.10-210.1.1.20\",\n\"location\":\"4050083f-465f-4838-af1e-47a545222ad0\",\n\"sdncontroller\":\"9b9f02c0-298b-458a-bc9c-be3692e4f35e\"\n}\n}\n}\n]" - }, - { - "name": "nsParameters", - "value": "{\n \"locationConstraints\": {},\n \"additionalParamForNs\": {\n \"E2EServcie.param1\": \"value1\",\n \"E2EServcie.param2\": \"value2\"\n }\n }" - } - ] - }}} + "globalSubscriberId":"388499302", + "serviceType" : "VoLTE" } \ No newline at end of file -- 2.16.6