X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-app-common%2Fsrc%2Ftest%2Fresources%2Fvl-csar.JSON;h=ff7eb4719089686ae36799be9ee838cb49283922;hb=1cfb08779ea0e00be69e072a940b3063e049fe6b;hp=78f6a63da23ddf3cf5b31cd3615a3c903ebd8007;hpb=2f20b001b9243e0f8b44aecc768ec265fd538732;p=vid.git

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