Merge 1806 code of vid-common
Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
diff --git a/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
new file mode 100644
index 0000000..993cfb2
--- /dev/null
+++ b/vid-app-common/src/test/resources/policy-configuration-by-policy-false.JSON
@@ -0,0 +1,166 @@
+{
+ "service": {
+ "uuid": "ee6d61be-4841-4f98-8f23-5de9da845544",
+ "invariantUuid": "b7d923c9-6175-41f1-91ba-4565c4955555",
+ "name": "ServiceContainerMultiplepProbes2",
+ "version": "2.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-1f05f0434567",
+ "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"
+ ],
+ "collectorNodes": [
+ "pprobeservice_proxy 5"
+ ],
+ "configurationByPolicy": false
+ },
+ "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": [
+ ],
+ "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