summaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/test/resources
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@att.com>2018-01-31 17:19:00 +0200
committerOfir Sonsino <os0695@att.com>2018-01-31 17:19:00 +0200
commit1cfb08779ea0e00be69e072a940b3063e049fe6b (patch)
tree6602a900387c8393ed0dcd81c0539381632903c6 /vid-app-common/src/test/resources
parent2f20b001b9243e0f8b44aecc768ec265fd538732 (diff)
org.onap migration
Change-Id: I52f0b2851f2c765752b6d21f49b32136d7d72a3d Issue-ID: VID-86 Signed-off-by: Ofir Sonsino <os0695@att.com>
Diffstat (limited to 'vid-app-common/src/test/resources')
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/conf/system.properties36
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp6
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp66
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp2
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp8
-rw-r--r--vid-app-common/src/test/resources/asdc.properties2
-rw-r--r--vid-app-common/src/test/resources/csv_files/csv_to_json.csv99
-rw-r--r--vid-app-common/src/test/resources/csv_files/empty_file.csv18
-rw-r--r--vid-app-common/src/test/resources/csv_files/missing_content.csv2
-rw-r--r--vid-app-common/src/test/resources/csv_files/missing_values.csv2
-rw-r--r--vid-app-common/src/test/resources/csv_files/one_line.csv1
-rw-r--r--vid-app-common/src/test/resources/mso.properties1
-rwxr-xr-xvid-app-common/src/test/resources/objectconfig.properties2
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json23
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json24
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json12
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json62
-rw-r--r--vid-app-common/src/test/resources/policy-configuration-csar.JSON168
-rw-r--r--vid-app-common/src/test/resources/services/change_management_software_update_expected_mso_request.json15
-rw-r--r--vid-app-common/src/test/resources/services/change_management_software_update_request.json26
-rw-r--r--vid-app-common/src/test/resources/vf-csar.JSON51
-rw-r--r--vid-app-common/src/test/resources/vl-csar.JSON40
-rw-r--r--vid-app-common/src/test/resources/vnfConfigUpdatePayload.json40
23 files changed, 645 insertions, 61 deletions
diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
index 9da6303d6..a67f57897 100644
--- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
+++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties
@@ -79,7 +79,18 @@ element_map_icon_path = app/fusionapp/icons/
#aai.oldserver.url=https://mtanjv9aaas40.aic.cip.att.com:8443/aai/servers/v3/
#ist servers
aai.server.url.base=https://aai-ext1.test.att.com:8443/aai/
-aai.server.url=https://aai-ext1.test.att.com:8443/aai/v11/
+#aai.server.url=https://aai-ext1.test.att.com:8443/aai/v12/
+aai.server.url=http://localhost:8080/vidSimulator/aai/v12/
+#aai.server.url=http://localhost:1080/aai
+#aai.server.url=https://aai-int2.test.att.com:8443/aai/v12/
+
+
+
+
+
+
+
+
aai.oldserver.url.base=https://aai-ext1.test.att.com:8443/aai/servers/
aai.oldserver.url=https://aai-ext1.test.att.com:8443/aai/servers/v3/
aai.truststore.filename=tomcat_keystore
@@ -88,7 +99,6 @@ aai.keystore.filename=aai-client-cert.p12
aai.keystore.passwd.x=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
aai.use.client.cert=false
aai.vnf.provstatus=PREPROV,NVTPROV,PROV,CAPPED
-aai_get_version_by_invariant_id="service-design-and-creation/models?depth=2&model-invariant-id="
#Cron Schedules have 6 required fields and 1 optional field:
# Seconds Minutes Hours Day-of-Month Month Day-of-Week Year
@@ -136,16 +146,20 @@ mso.client.type=LOCAL
mso.server.url=http://vm1.mso.simpledemo.openecomp.org:8080
mso.polling.interval.msecs=10000
mso.max.polls=10
-mso.user.name=InfraPortalClient
-mso.password.x=OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
-mso.restapi.svc.instance=/ecomp/mso/infra/serviceInstances/v4
-mso.restapi.vnf.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs
-mso.restapi.network.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/networks
-mso.restapi.vf.module.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
-mso.restapi.volume.group.instance=/ecomp/mso/infra/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
-mso.restapi.get.orc.req=/ecomp/mso/infra/orchestrationRequests/v4
-mso.restapi.get.orc.reqs=/ecomp/mso/infra/orchestrationRequests/v4?
+mso.user.name=infraportal
+mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz
+mso.restapi.svc.instance=/serviceInstances/v5
+mso.restapi.vnf.instance=/serviceInstances/v5/<service_instance_id>/vnfs
+mso.restapi.vnf.changemanagement.instance=/serviceInstances/v5/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type>
+mso.restapi.network.instance=/serviceInstances/v5/<service_instance_id>/networks
+mso.restapi.vf.module.instance=/serviceInstances/v5/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
+mso.restapi.volume.group.instance=/serviceInstances/v5/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.get.orc.req=/orchestrationRequests/v5
+mso.restapi.get.orc.reqs=/orchestrationRequests/v5?
mso.restapi.get.man.tasks=/tasks/v1
+mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
+mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_id>
+
vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks
mso.dme2.client.timeout=30000
mso.dme2.client.read.timeout=120000
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp
index 2c7dd9f5f..76fe13e4b 100644
--- a/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp
+++ b/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp
@@ -12,7 +12,7 @@
<script src="app/vid/test/testAaiData.js"></script>
<script src="app/vid/scripts/controller/creationDialogController.js"></script>
-<script src="app/vid/scripts/controller/deletionDialogController.js"></script>
+<script src="app/vid/scripts/controller/deleteResumeDialogController.js"></script>
<script src="app/vid/scripts/controller/detailsDialogController.js"></script>
<script src="app/vid/scripts/controller/statusDialogController.js"></script>
<script src="app/vid/scripts/controller/msoCommitController.js"></script>
@@ -21,7 +21,7 @@
<script src="app/vid/scripts/services/asdcService.js"></script>
<script src="app/vid/scripts/services/creationService.js"></script>
<script src="app/vid/scripts/services/dataService.js"></script>
-<script src="app/vid/scripts/services/deletionService.js"></script>
+<script src="app/vid/scripts/services/deleteResumeService.js"></script>
<script src="app/vid/scripts/services/detailsService.js"></script>
<script src="app/vid/scripts/services/statusService.js"></script>
<script src="app/vid/scripts/services/componentService.js"></script>
@@ -43,7 +43,7 @@
<link rel="stylesheet" type="text/css" href="app/vid/styles/angular-ui-tree.css" />
<link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" />
-<%@ page import="org.openecomp.vid.mso.*"%>
+<%@ page import="org.onap.vid.mso.*"%>
<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
<%
String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp
index 9fdf75d64..2adaf447d 100644
--- a/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp
+++ b/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp
@@ -1,3 +1,4 @@
+<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="app/vid/styles/aaiGetSubs.css" />
<link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubDetails.css" />
<link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubViewEdit.css" />
@@ -6,18 +7,20 @@
<link rel="stylesheet" type="text/css" href="app/vid/styles/instantiate.css" />
<link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" />
<link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" />
-<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" />
+<link rel="stylesheet" type="text/css" href="app/vid/styles/angularjs-datetime-picker.css"></link>
+<link rel="stylesheet" type="text/css" href="app/vid/styles/common.css" />
<script>
var appDS2 = app;
</script>
+
<script src="app/vid/scripts/controller/VidApp.js"></script>
<!-- Latest compiled and minified JavaScript -->
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+<script src="app/vid/external/bootstrap/js/bootstrap.min.js"></script>
<script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>
@@ -32,28 +35,45 @@
<script src="app/vid/scripts/filters/date.filter.js"></script>
<script src="app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.controller.js"></script>
<script src="app/vid/scripts/modals/new-change-management/new-change-management.controller.js"></script>
+<script src="app/vid/scripts/modals/alert-modal/alert-modal.controller.js"></script>
+<script src="app/vid/scripts/modals/new-test-environment/new-test-environment.controller.js"></script>
+
+<script src="app/vid/scripts/modals/alert-modal/alert-modal.controller.js"></script>
<script src="app/vid/scripts/controller/aaiSubscriberController.js"></script>
<script src="app/vid/scripts/controller/creationDialogController.js"></script>
-<script src="app/vid/scripts/controller/deletionDialogController.js"></script>
+<script src="app/vid/scripts/controller/deleteResumeDialogController.js"></script>
<script src="app/vid/scripts/controller/detailsDialogController.js"></script>
<script src="app/vid/scripts/controller/statusDialogController.js"></script>
<script src="app/vid/scripts/controller/InstantiationController.js"></script>
<script src="app/vid/scripts/controller/msoCommitController.js"></script>
+<script src="app/vid/scripts/controller/pnfSearchAssociationController.js"></script>
<script src="app/vid/scripts/controller/ServiceModelController.js"></script>
<script src="app/vid/scripts/controller/previousVersionDialogController.js"></script>
<script src="app/vid/scripts/controller/previousVersionContoller.js"></script>
+<script src="app/vid/scripts/controller/AddNetworkNodeController.js"></script>
<script src="app/vid/scripts/controller/change-management.controller.js"></script>
+<script src="app/vid/scripts/controller/testEnvironmentsController.js"></script>
+<script src="app/vid/scripts/controller/ServiceProxyConfigController.js"></script>
+
+<script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script>
+<script src="app/vid/scripts/controller/ServiceProxyConfigController.js"></script>
+
+<script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script>
+<script src="app/vid/scripts/controller/msoCommitModalController.js"></script>
+
<script src="app/vid/scripts/directives/extensionsDirective.js"></script>
<script src="app/vid/scripts/directives/parameterBlockDirective.js"></script>
<script src="app/vid/scripts/directives/popupWindowDirective.js"></script>
<script src="app/vid/scripts/directives/progressBarDirective.js"></script>
+<script src="app/vid/scripts/directives/serviceMetadata.js"></script>
<script src="app/vid/scripts/services/aaiService.js"></script>
+<script src="app/vid/scripts/services/schedulerService.js"></script>
<script src="app/vid/scripts/services/asdcService.js"></script>
<script src="app/vid/scripts/services/componentService.js"></script>
<script src="app/vid/scripts/services/creationService.js"></script>
<script src="app/vid/scripts/services/dataService.js"></script>
-<script src="app/vid/scripts/services/deletionService.js"></script>
+<script src="app/vid/scripts/services/deleteResumeService.js"></script>
<script src="app/vid/scripts/services/detailsService.js"></script>
<script src="app/vid/scripts/services/statusService.js"></script>
<script src="app/vid/scripts/services/msoService.js"></script>
@@ -61,8 +81,12 @@
<script src="app/vid/scripts/services/utilityService.js"></script>
<script src="app/vid/scripts/services/vnfService.js"></script>
<script src="app/vid/scripts/services/change-management.service.js"></script>
+<script src="app/vid/scripts/modals/cancel-pending-workflow/cancel-pending-workflow.controller.js"></script>
+<script src="app/vid/scripts/services/OwningEntityService.js"></script>
+<script src="app/vid/scripts/services/testEnvironmentsService.js"></script>
-<%@ page import="org.openecomp.vid.mso.*"%>
+
+<%@ page import="org.onap.vid.mso.*"%>
<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
<%
String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
@@ -75,18 +99,20 @@
<div ng-view></div>
</div>
<!-- Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
+<div class="temporary-solution">
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+ <br>
+</div>
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp
index abcc8e26d..711308996 100644
--- a/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp
+++ b/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp
@@ -31,7 +31,7 @@
Consider / investigate replacing this approach with an alternative
REST / Angular mechanism.
-->
-<%@ page import="org.openecomp.vid.mso.*"%>
+<%@ page import="org.onap.vid.mso.*"%>
<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
<%
String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp
index 031fedf8c..105ff0b58 100644
--- a/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp
+++ b/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp
@@ -7,7 +7,7 @@
<link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" />
<script src="app/vid/scripts/controller/creationDialogController.js"></script>
-<script src="app/vid/scripts/controller/deletionDialogController.js"></script>
+<script src="app/vid/scripts/controller/deleteResumeDialogController.js"></script>
<script src="app/vid/scripts/controller/detailsDialogController.js"></script>
<script src="app/vid/scripts/controller/statusDialogController.js"></script>
<script src="app/vid/scripts/controller/msoCommitController.js"></script>
@@ -16,7 +16,7 @@
<script src="app/vid/scripts/services/asdcService.js"></script>
<script src="app/vid/scripts/services/creationService.js"></script>
<script src="app/vid/scripts/services/dataService.js"></script>
-<script src="app/vid/scripts/services/deletionService.js"></script>
+<script src="app/vid/scripts/services/deleteResumeService.js"></script>
<script src="app/vid/scripts/services/detailsService.js"></script>
<script src="app/vid/scripts/services/statusService.js"></script>
<script src="app/vid/scripts/services/componentService.js"></script>
@@ -40,7 +40,7 @@
Consider / investigate replacing this approach with an alternative
REST / Angular mechanism.
-->
-<%@ page import="org.openecomp.vid.mso.*"%>
+<%@ page import="org.onap.vid.mso.*"%>
<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
<%
String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
@@ -54,7 +54,7 @@
<div popup-window class="popupContents" ngx-show="{{popup.isVisible}}"
ng-cloak>
<div ng-include="'app/vid/scripts/view-models/creationDialog.htm'"></div>
- <div ng-include="'app/vid/scripts/view-models/deletionDialog.htm'"></div>
+ <div ng-include="'app/vid/scripts/view-models/deleteResumeDialog.htm'"></div>
<div ng-include="'app/vid/scripts/view-models/detailsDialog.htm'"
onload="autoStartTest();"></div>
</div>
diff --git a/vid-app-common/src/test/resources/asdc.properties b/vid-app-common/src/test/resources/asdc.properties
index 8352ff213..b40aa9ab2 100644
--- a/vid-app-common/src/test/resources/asdc.properties
+++ b/vid-app-common/src/test/resources/asdc.properties
@@ -1,4 +1,4 @@
-asdc.client.type=REST
+asdc.client.type=LOCAL
asdc.client.rest.protocol=http
asdc.client.rest.host=c2.vm1.sdc.simpledemo.openecomp.org
diff --git a/vid-app-common/src/test/resources/csv_files/csv_to_json.csv b/vid-app-common/src/test/resources/csv_files/csv_to_json.csv
new file mode 100644
index 000000000..02229caf8
--- /dev/null
+++ b/vid-app-common/src/test/resources/csv_files/csv_to_json.csv
@@ -0,0 +1,99 @@
+payload,request-parameters,,,vnf-name,ibcx0099v
+payload,request-parameters,[vm],,vm-name,ibcx0001vm001
+payload,request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm001dbg001
+payload,request-parameters,[vm],[vnfc],vnfc-function-code,dbg
+payload,request-parameters,[vm],[vnfc],vnfc-type,DBE-VM #1
+payload,request-parameters,[vm],[vnfc],group-notation,ibcx0001vm001dbg001pair
+payload,request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,135.21.166.39
+payload,request-parameters,[vm],,vm-name,ibcx0001vm002
+payload,request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm002dbg001
+payload,request-parameters,[vm],[vnfc],vnfc-function-code,dbg
+payload,request-parameters,[vm],[vnfc],vnfc-type,DBE-VM #1
+payload,request-parameters,[vm],[vnfc],group-notation,ibcx0001vm001dbg001pair
+,,,,,
+payload,request-parameters,,,template-name,vdbe_template1
+payload,configuration,,,configuration-string," <configuration xmlns=""http://xml.juniper.net/xnm/1.1/xnm""
+ xmlns:a=""http://xml.juniper.net/junos/15.1X49/junos"" >
+ <version>15.1X49-D50.3</version>
+ <groups>
+ <name>node0</name>
+ <system>
+ <host-name>$node0_hostname</host-name>
+ <backup-router>
+ <address>$node0_backup_router_address</address>
+ <destination>0.0.0.0/0</destination>
+ </backup-router>
+ </system>
+ </groups>
+ </configuration>"
+payload,configuration,,,configuration-json,"{
+ ""version"": ""15.1X49-D50.3"",
+ ""groups"": {
+ ""name"": ""node0"",
+ ""system"": {
+ ""host-name"": ""$node0_hostname"",
+ ""backup-router"": {
+ ""address"": ""$node0_backup_router_address"",
+ ""destination"": ""0.0.0.0/0""
+ }
+ }
+ }
+}"
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+payload,configuration-parameters,nat_source_sp_v6rogerssnat_address1,2001:1890:fc45:f025:135:25:246:c806/128
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
diff --git a/vid-app-common/src/test/resources/csv_files/empty_file.csv b/vid-app-common/src/test/resources/csv_files/empty_file.csv
new file mode 100644
index 000000000..8a4b14f25
--- /dev/null
+++ b/vid-app-common/src/test/resources/csv_files/empty_file.csv
@@ -0,0 +1,18 @@
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,,
+,,,,, \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/csv_files/missing_content.csv b/vid-app-common/src/test/resources/csv_files/missing_content.csv
new file mode 100644
index 000000000..9b9e14db1
--- /dev/null
+++ b/vid-app-common/src/test/resources/csv_files/missing_content.csv
@@ -0,0 +1,2 @@
+payload,request-parameters,,,ibcx0099v
+payload,request-parameters,,aa,vv \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/csv_files/missing_values.csv b/vid-app-common/src/test/resources/csv_files/missing_values.csv
new file mode 100644
index 000000000..0e914f026
--- /dev/null
+++ b/vid-app-common/src/test/resources/csv_files/missing_values.csv
@@ -0,0 +1,2 @@
+payload,,,,,
+payload,request-parameters,,aa,vv
diff --git a/vid-app-common/src/test/resources/csv_files/one_line.csv b/vid-app-common/src/test/resources/csv_files/one_line.csv
new file mode 100644
index 000000000..315e93989
--- /dev/null
+++ b/vid-app-common/src/test/resources/csv_files/one_line.csv
@@ -0,0 +1 @@
+payload,request-parameters,,,vnf-name,ibcx0099v \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/mso.properties b/vid-app-common/src/test/resources/mso.properties
index 8f2bb01a9..fcd20bd7a 100644
--- a/vid-app-common/src/test/resources/mso.properties
+++ b/vid-app-common/src/test/resources/mso.properties
@@ -8,6 +8,7 @@ mso.restapi.vnf.instance=/serviceInstances/v3/<service_instance_id>/vnfs
mso.restapi.network.instance=/serviceInstances/v3/<service_instance_id>/networks
mso.restapi.vf.module.instance=/serviceInstances/v3/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules
mso.restapi.volume.group.instance=/serviceInstances/v3/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups
+mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
mso.restapi.get.orc.req=/orchestrationRequests/v3
mso.restapi.get.orc.reqs=/orchestrationRequests/v3?
mso.restapi.get.man.tasks=/tasks/v1
diff --git a/vid-app-common/src/test/resources/objectconfig.properties b/vid-app-common/src/test/resources/objectconfig.properties
index 312e5bccc..0093129ff 100755
--- a/vid-app-common/src/test/resources/objectconfig.properties
+++ b/vid-app-common/src/test/resources/objectconfig.properties
@@ -14,3 +14,5 @@ subscriberNameDropDown=.//*[@id='mContent']/div/div/table/tbody/tr[1]/td[2]/div/
serviceTypeDropDown=.//*[@id='mContent']/div/div/table/tbody/tr[2]/td[2]/div/select
submitButton=.//*[@id='mContent']/div/div/table/tbody/tr[3]/td/div/button
+test.loginId=2222
+test.loginPassword=2222
diff --git a/vid-app-common/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json b/vid-app-common/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json
new file mode 100644
index 000000000..400a55f9e
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/activateOperationalEnvironmentsPayloadToMso.json
@@ -0,0 +1,23 @@
+{
+ "requestDetails": {
+ "requestInfo": {
+ "resourceType": "operationalEnvironment",
+ "source": "VID",
+ "requestorId": "<userId>"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "resourceType": "operationalEnvironment",
+ "instanceId": "<relatedInstanceId>",
+ "instanceName": "<relatedInstanceName>"
+ }
+ }
+ ],
+ "requestParameters": {
+ "operationalEnvironmentType": "VNF",
+ "workloadContext": "<workloadContext>",
+ "manifest": <manifest>
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json b/vid-app-common/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json
new file mode 100644
index 000000000..bdfdb4e76
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/createOperationalEnvironmentsPayloadToMso.json
@@ -0,0 +1,24 @@
+{
+ "requestDetails": {
+ "requestInfo": {
+ "resourceType": "operationalEnvironment",
+ "instanceName": "<instanceName>",
+ "source": "VID",
+ "requestorId": "<userId>"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "resourceType": "operationalEnvironment",
+ "instanceId": "<ecompInstanceId>",
+ "instanceName": "<ecompInstanceName>"
+ }
+ }
+ ],
+ "requestParameters": {
+ "operationalEnvironmentType": "<operationalEnvType>",
+ "tenantContext": "<tenantContext>",
+ "workloadContext": "<workloadContext>"
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json b/vid-app-common/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json
new file mode 100644
index 000000000..b9ff15127
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/deactivateOperationalEnvironmentsPayloadToMso.json
@@ -0,0 +1,12 @@
+{
+ "requestDetails": {
+ "requestInfo": {
+ "resourceType": "operationalEnvironment",
+ "source": "VID",
+ "requestorId": "<userId>"
+ },
+ "requestParameters": {
+ "operationalEnvironmentType": "VNF"
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json b/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json
new file mode 100644
index 000000000..e0942bae2
--- /dev/null
+++ b/vid-app-common/src/test/resources/payload_jsons/mso_request_create_configuration.json
@@ -0,0 +1,62 @@
+
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "configuration",
+ "modelInvariantId": "c30a024e-a6c6-4670-b73c-3df64eb57ff6",
+ "modelVersionId": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c",
+ "modelName": "Port Mirroring Configuration By Policy",
+ "modelVersion": "1.0",
+ "modelCustomizationId": "4b7ebace-bad6-4526-9be6-bf248e20fc5f",
+ "modelCustomizationName": "Port Mirroring Configuration By Policy 1"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "AAIAIC25"
+ },
+ "requestInfo": {
+ "instanceName":"test_sssdad",
+ "source": "VID",
+ "requestorId": "1"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6 ",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408",
+ "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7",
+ "modelName": "ServiceContainerMultiplepProbes",
+ "modelVersion": "1.0"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7",
+ "instanceDirection": "source",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
+ "modelVersionId": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
+ "modelName": "vmmeService2",
+ "modelVersion": "1.0",
+ "modelCustomizationId": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17"
+ }
+ }
+ },
+ {
+ "relatedInstance": {
+ "instanceId": "AS-pnf2-10219--as988q",
+ "instanceDirection": "destination",
+ "modelInfo": {
+ "modelType": "pnf"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/policy-configuration-csar.JSON b/vid-app-common/src/test/resources/policy-configuration-csar.JSON
new file mode 100644
index 000000000..8e9b46e7a
--- /dev/null
+++ b/vid-app-common/src/test/resources/policy-configuration-csar.JSON
@@ -0,0 +1,168 @@
+{
+ "service": {
+ "uuid": "ee6d61be-4841-4f98-8f23-5de9da846ca7",
+ "invariantUuid": "b7d923c9-6175-41f1-91ba-4565c4953408",
+ "name": "ServiceContainerMultiplepProbes",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "portMirroring",
+ "serviceRole": "pProbe",
+ "description": "sdfsdfsdf",
+ "serviceEcompNaming": "true",
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {},
+ "configurations": {
+ "Port Mirroring Configuration By Policy 1": {
+ "uuid": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c",
+ "invariantUuid": "c30a024e-a6c6-4670-b73c-3df64eb57ff6",
+ "description": "A port mirroring configuration by policy object",
+ "name": "Port Mirroring Configuration By Policy",
+ "version": "1.0",
+ "customizationUuid": "4b7ebace-bad6-4526-9be6-bf248e20fc5f",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "collector_node": "pprobeservice_proxy 5",
+ "policy_name": "policy2",
+ "equip_vendor": "Cisco",
+ "equip_model": "Nexus 3048-TP"
+ },
+ "type": "Configuration",
+ "modelCustomizationName": "Port Mirroring Configuration By Policy 1",
+ "sourceNodes": [
+ "vmmeservice2_proxy 2",
+ "vmmeservice2_proxy 3",
+ "vmmeservice_proxy 1"
+ ],
+ "collectorNodes": [
+ "pprobeservice_proxy 5"
+ ],
+ "configurationByPolicy": true
+ },
+ "Port Mirroring Configuration By Policy 0": {
+ "uuid": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c",
+ "invariantUuid": "c30a024e-a6c6-4670-b73c-3df64eb57ff6",
+ "description": "A port mirroring configuration by policy object",
+ "name": "Port Mirroring Configuration By Policy",
+ "version": "1.0",
+ "customizationUuid": "08a181aa-72eb-435f-9593-e88a3ad0a86b",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "collector_node": "pprobeservice_proxy 4",
+ "policy_name": "policy1",
+ "equip_vendor": "Cisco",
+ "equip_model": "Nexus 3048-TP"
+ },
+ "type": "Configuration",
+ "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
+ "sourceNodes": [
+ "vmmeservice2_proxy 2",
+ "vmmeservice_proxy 1",
+ "vmmeservice_proxy 0"
+ ],
+ "collectorNodes": [
+ "pprobeservice_proxy 4"
+ ],
+ "configurationByPolicy": true
+ }
+ },
+ "serviceProxies": {
+ "vmmeservice_proxy 0": {
+ "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
+ "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
+ "description": "A Proxy for Service vmmeService",
+ "name": "vmmeService Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Service Proxy",
+ "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
+ "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
+ "sourceModelName": "vmmeService"
+ },
+ "vmmeservice_proxy 1": {
+ "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
+ "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
+ "description": "A Proxy for Service vmmeService",
+ "name": "vmmeService Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Service Proxy",
+ "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5",
+ "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3",
+ "sourceModelName": "vmmeService"
+ },
+ "vmmeservice2_proxy 3": {
+ "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
+ "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
+ "description": "A Proxy for Service vmmeService2",
+ "name": "vmmeService2 Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Service Proxy",
+ "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
+ "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
+ "sourceModelName": "vmmeService2"
+ },
+ "pprobeservice_proxy 4": {
+ "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
+ "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
+ "description": "A Proxy for Service pProbeService",
+ "name": "pProbeService Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "271efa3b-276e-4536-976a-cc9c9c014f1e",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Service Proxy",
+ "sourceModelUuid": "8a84e59b-45fe-4851-8ff1-34225a0b32c3",
+ "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911",
+ "sourceModelName": "pProbeService"
+ },
+ "pprobeservice_proxy 5": {
+ "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
+ "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
+ "description": "A Proxy for Service pProbeService",
+ "name": "pProbeService Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "d64623ae-5935-4afd-803e-c86e94d8e740",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Service Proxy",
+ "sourceModelUuid": "8a84e59b-45fe-4851-8ff1-34225a0b32c3",
+ "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911",
+ "sourceModelName": "pProbeService"
+ },
+ "vmmeservice2_proxy 2": {
+ "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee",
+ "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10",
+ "description": "A Proxy for Service vmmeService2",
+ "name": "vmmeService2 Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Service Proxy",
+ "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
+ "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
+ "sourceModelName": "vmmeService2"
+ }
+ },
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {}
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/services/change_management_software_update_expected_mso_request.json b/vid-app-common/src/test/resources/services/change_management_software_update_expected_mso_request.json
new file mode 100644
index 000000000..3ac1cf533
--- /dev/null
+++ b/vid-app-common/src/test/resources/services/change_management_software_update_expected_mso_request.json
@@ -0,0 +1,15 @@
+{
+ "requestDetails": {
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/services/change_management_software_update_request.json b/vid-app-common/src/test/resources/services/change_management_software_update_request.json
new file mode 100644
index 000000000..1b697d6ba
--- /dev/null
+++ b/vid-app-common/src/test/resources/services/change_management_software_update_request.json
@@ -0,0 +1,26 @@
+{ "requestDetails": [
+ {
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "payload": "{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
+ },
+ "vnfName": "vidVnf",
+ "vnfInstanceId": "abe59ceb-6909-4a2c-ad6a-c46d90b18f0b",
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "166b2c5b-6746-4613-bd38-faf46f7afb73"
+ }
+ }
+ ]
+ }
+ ],
+ "requestType": "VNF In Place Software Update"
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vf-csar.JSON b/vid-app-common/src/test/resources/vf-csar.JSON
index 097b319a2..e919241ef 100644
--- a/vid-app-common/src/test/resources/vf-csar.JSON
+++ b/vid-app-common/src/test/resources/vf-csar.JSON
@@ -4,8 +4,8 @@
"service": {
"category": "Mobility",
"description": "Bla bla",
- "serviceRole":"null",
- "serviceType":"null",
+ "serviceRole":null,
+ "serviceType":null,
"inputs": {
"greatdefect0_availability_zone_max_count": {
@@ -41,10 +41,13 @@
"serviceEcompNaming": "true",
"toscaModelURL": null,
"uuid": "48a52540-8772-4368-9cdb-1f124ea5c931",
- "version": "0.1"
+ "version": "1.0",
+ "instantiationType" : null
},
"vfModules": {
"greatdefect0..Greatdefect..base_ixla..module-0": {
+
+
"commands": {
},
"customizationUuid": "316e323d-611d-4007-a647-b1d2ecdaee9e",
@@ -100,6 +103,8 @@
"inputName": "greatdefect0_vf_module_id"
}
},
+ "type":"VF",
+
"customizationUuid": "9123ced3-fbcd-42f7-b103-5965c54bbd66",
"description": "checl-IdanWithSecondFix",
"inputs": {
@@ -146,11 +151,47 @@
"uuid": "3b25707a-d345-4a80-8744-73adf8f2e67b",
"version": "3.0",
"vfModules": {
+ "greatdefect0..Greatdefect..module_1_ixla..module-2": {
+ "uuid": "6f09e053-56a6-4fbb-8299-e1de616825cc",
+ "invariantUuid": "e0297a51-c670-452e-b31c-c5b37c6ad40f",
+ "customizationUuid": "1106fca3-235a-4f92-8d5a-960a7336b32f",
+ "description": null,
+ "name": "Greatdefect..module_1_ixla..module-2",
+ "version": "3",
+ "volumeGroupAllowed": false,
+ "commands": {},
+ "modelCustomizationName": "Greatdefect..module_1_ixla..module-2"
+ },
+ "greatdefect0..Greatdefect..base_ixla..module-0": {
+ "uuid": "01166434-ef34-4969-aaf2-626203d72e48",
+ "invariantUuid": "80ff85fb-cb11-42cb-9737-e47095d42756",
+ "customizationUuid": "316e323d-611d-4007-a647-b1d2ecdaee9e",
+ "description": null,
+ "name": "Greatdefect..base_ixla..module-0",
+ "version": "3",
+ "volumeGroupAllowed": false,
+ "commands": {},
+ "modelCustomizationName": "Greatdefect..base_ixla..module-0"
+ },
+ "greatdefect0..Greatdefect..module_2_ixla..module-1": {
+ "uuid": "dea8e41f-c996-4557-b521-263210d96baa",
+ "invariantUuid": "23befc6e-aa97-4004-b215-4979c3f84913",
+ "customizationUuid": "b52c1fda-fbbf-4de3-ad9b-190d4a14990c",
+ "description": null,
+ "name": "Greatdefect..module_2_ixla..module-1",
+ "version": "3",
+ "volumeGroupAllowed": false,
+ "commands": {},
+ "modelCustomizationName": "Greatdefect..module_2_ixla..module-1"
+ }
},
"volumeGroups": {
}
}
},
- "volumeGroups": {
- }
+ "volumeGroups": {},
+ "configurations":{},
+ "serviceProxies":{},
+ "pnfs":{}
+
}
diff --git a/vid-app-common/src/test/resources/vl-csar.JSON b/vid-app-common/src/test/resources/vl-csar.JSON
index 78f6a63da..ff7eb4719 100644
--- a/vid-app-common/src/test/resources/vl-csar.JSON
+++ b/vid-app-common/src/test/resources/vl-csar.JSON
@@ -1,12 +1,8 @@
{
"networks": {
"ExtVL 0": {
+ "type": "VL",
"commands": {
- "exVL_naming#naming_policy": {
- "command": "get_input",
- "displayName": "exVL_naming#naming_policy",
- "inputName": "extvl0_exVL_naming_naming_policy"
- },
"network_role": {
"command": "get_input",
"displayName": "network_role",
@@ -16,34 +12,39 @@
"command": "get_input",
"displayName": "network_scope",
"inputName": "extvl0_network_scope"
+ },
+ "exVL_naming#naming_policy": {
+ "command": "get_input",
+ "displayName": "exVL_naming#naming_policy",
+ "inputName": "extvl0_exVL_naming_naming_policy"
}
},
"customizationUuid": "664f8aa7-3989-46ac-81c0-dd72a8a63f26",
"description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
"inputs": {
- "exVL_naming#naming_policy": {
+ "network_role": {
"constraints": [
],
"default": null,
- "description": "Reference to naming policy that ECOMP will use when the name is auto-generated",
+ "description": "Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network\n",
"entry_schema": null,
"required": true,
"type": "string"
},
- "network_role": {
+ "network_scope": {
"constraints": [
],
"default": null,
- "description": "Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network\n",
+ "description": "Uniquely identifies the network scope. Valid values for the network scope includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects the VFs within the service GLOBAL - Global network which can be shared by multiple services\n",
"entry_schema": null,
"required": true,
"type": "string"
},
- "network_scope": {
+ "exVL_naming#naming_policy": {
"constraints": [
],
"default": null,
- "description": "Uniquely identifies the network scope. Valid values for the network scope includes: VF - VF-level network. Intra-VF network which connects the VFCs (VMs) inside the VF. SERVICE - Service-level network. Intra-Service network which connects the VFs within the service GLOBAL - Global network which can be shared by multiple services\n",
+ "description": "Reference to naming policy that ECOMP will use when the name is auto-generated",
"entry_schema": null,
"required": true,
"type": "string"
@@ -53,7 +54,7 @@
"modelCustomizationName": "ExtVL 0",
"name": "ExtVL",
"properties": {
- "exVL_naming": "{naming_policy={get_input=extvl0_exVL_naming_naming_policy}}",
+ "exVL_naming": "{naming_policy=get_input:extvl0_exVL_naming_naming_policy}",
"network_role": "get_input:extvl0_network_role",
"network_scope": "get_input:extvl0_network_scope"
},
@@ -64,8 +65,8 @@
"service": {
"category": "Network L1-3",
"description": "dsfg",
- "serviceRole":"null",
- "serviceType":"null",
+ "serviceRole": null,
+ "serviceType": null,
"inputs": {
"extvl0_exVL_naming_naming_policy": {
"constraints": [
@@ -100,12 +101,19 @@
"serviceEcompNaming": "true",
"toscaModelURL": null,
"uuid": "68101369-6f08-4e99-9a28-fa6327d344f3",
- "version": "0.1"
+ "version": "1.0",
+ "instantiationType" : "ClientConfig"
},
"vfModules": {
},
"vnfs": {
},
"volumeGroups": {
+ },
+ "configurations": {
+ },
+ "serviceProxies": {
+ },
+ "pnfs": {
}
-}
+} \ No newline at end of file
diff --git a/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json b/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json
new file mode 100644
index 000000000..cb2bf307c
--- /dev/null
+++ b/vid-app-common/src/test/resources/vnfConfigUpdatePayload.json
@@ -0,0 +1,40 @@
+{
+ "payload":{
+ "request-parameters":{
+ "vm":[
+ {
+ "vnfc":[
+ {
+ "ipaddress-v4-oam-vip":"135.21.166.39",
+ "vnfc-name":"ibcx0001vm001dbg001",
+ "vnfc-function-code":"dbg",
+ "vnfc-type":"DBE-VM #1",
+ "group-notation":"ibcx0001vm001dbg001pair"
+ }
+ ],
+ "vm-name":"ibcx0001vm001"
+ },
+ {
+ "vnfc":[
+ {
+ "vnfc-name":"ibcx0001vm002dbg001",
+ "vnfc-function-code":"dbg",
+ "vnfc-type":"DBE-VM #1",
+ "group-notation":"ibcx0001vm001dbg001pair"
+ }
+ ],
+ "vm-name":"ibcx0001vm002"
+ }
+ ],
+ "vnf-name":"ibcx0099v",
+ "template-name":"vdbe_template1"
+ },
+ "configuration":{
+ "configuration-json":"{\n \"version\": \"15.1X49-D50.3\",\n \"groups\": {\n \"name\": \"node0\",\n \"system\": {\n \"host-name\": \"$node0_hostname\",\n \"backup-router\": {\n \"address\": \"$node0_backup_router_address\",\n \"destination\": \"0.0.0.0/0\"\n }\n }\n }\n}",
+ "configuration-string": " <configuration xmlns=\"http://xml.juniper.net/xnm/1.1/xnm\" \n xmlns:a=\"http://xml.juniper.net/junos/15.1X49/junos\" >\n <version>15.1X49-D50.3<\/version>\n <groups>\n <name>node0<\/name>\n <system>\n <host-name>$node0_hostname<\/host-name>\n <backup-router>\n <address>$node0_backup_router_address<\/address>\n <destination>0.0.0.0/0<\/destination>\n <\/backup-router>\n <\/system>\n <\/groups>\n <\/configuration>"
+ },
+ "configuration-parameters":{
+ "nat_source_sp_v6rogerssnat_address1":"2001:1890:fc45:f025:135:25:246:c806/128"
+ }
+ }
+} \ No newline at end of file