From c72d565bb58226b20625b2bce5f0019046bee649 Mon Sep 17 00:00:00 2001 From: "Sonsino, Ofir (os0695)" Date: Tue, 10 Jul 2018 14:20:54 +0300 Subject: Merge 1806 code of vid-common Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a Issue-ID: VID-208 Signed-off-by: Sonsino, Ofir (os0695) --- vid-app-common/src/test/resources/vl-csar.JSON | 155 +++++++++++-------------- 1 file changed, 65 insertions(+), 90 deletions(-) (limited to 'vid-app-common/src/test/resources/vl-csar.JSON') diff --git a/vid-app-common/src/test/resources/vl-csar.JSON b/vid-app-common/src/test/resources/vl-csar.JSON index ff7eb471..349d049f 100644 --- a/vid-app-common/src/test/resources/vl-csar.JSON +++ b/vid-app-common/src/test/resources/vl-csar.JSON @@ -1,119 +1,94 @@ { - "networks": { - "ExtVL 0": { - "type": "VL", - "commands": { - "network_role": { - "command": "get_input", - "displayName": "network_role", - "inputName": "extvl0_network_role" - }, - "network_scope": { - "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": { - "network_role": { - "constraints": [ - ], - "default": null, - "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_scope": { - "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", - "entry_schema": null, - "required": true, - "type": "string" - }, - "exVL_naming#naming_policy": { - "constraints": [ - ], - "default": null, - "description": "Reference to naming policy that ECOMP will use when the name is auto-generated", - "entry_schema": null, - "required": true, - "type": "string" - } - }, - "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c", - "modelCustomizationName": "ExtVL 0", - "name": "ExtVL", - "properties": { - "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" - }, - "uuid": "af584529-d7f0-420e-a6f3-c38b689c030f", - "version": "4.0" - } - }, "service": { + "uuid": "68101369-6f08-4e99-9a28-fa6327d344f3", + "invariantUuid": "d752a44c-ac7b-4bda-8111-fb52312d101e", + "name": "Macro_flow_test", + "version": "1.0", + "toscaModelURL": null, "category": "Network L1-3", - "description": "dsfg", - "serviceRole": null, "serviceType": null, + "serviceRole": null, + "description": "dsfg", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", "inputs": { - "extvl0_exVL_naming_naming_policy": { + "extvl0_network_scope": { + "type": "string", + "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, + "inputProperties": null, "constraints": [ + ], - "default": null, - "description": "Reference to naming policy that ECOMP will use when the name is auto-generated", - "entry_schema": null, "required": true, - "type": "string" + "default": null }, "extvl0_network_role": { - "constraints": [ - ], - "default": null, + "type": "string", "description": "Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network\n", "entry_schema": null, + "inputProperties": null, + "constraints": [ + + ], "required": true, - "type": "string" + "default": null }, - "extvl0_network_scope": { + "extvl0_exVL_naming_naming_policy": { + "type": "string", + "description": "Reference to naming policy that ECOMP will use when the name is auto-generated", + "entry_schema": null, + "inputProperties": null, "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", - "entry_schema": null, "required": true, - "type": "string" + "default": null } - }, - "invariantUuid": "d752a44c-ac7b-4bda-8111-fb52312d101e", - "name": "Macro_flow_test", - "serviceEcompNaming": "true", - "toscaModelURL": null, - "uuid": "68101369-6f08-4e99-9a28-fa6327d344f3", - "version": "1.0", - "instantiationType" : "ClientConfig" - }, - "vfModules": { + } }, "vnfs": { + }, - "volumeGroups": { + "networks": { + "ExtVL 0": { + "uuid": "af584529-d7f0-420e-a6f3-c38b689c030f", + "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c", + "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks", + "name": "ExtVL", + "version": "4.0", + "customizationUuid": "664f8aa7-3989-46ac-81c0-dd72a8a63f26", + "inputs": { + + }, + "commands": { + + }, + "properties": { + "network_role": "get_input:extvl0_network_role", + "exVL_naming": "{naming_policy=get_input:extvl0_exVL_naming_naming_policy}", + "network_scope": "get_input:extvl0_network_scope" + }, + "type": "VL", + "modelCustomizationName": "ExtVL 0" + } + }, + "collectionResource": { + }, "configurations": { + }, "serviceProxies": { + + }, + "vfModules": { + + }, + "volumeGroups": { + }, "pnfs": { + } } \ No newline at end of file -- cgit 1.2.3-korg