add UT to ToscaParserImpl and fix little bug

Issue-ID: VID-378
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I5ea0f09c2898c3a7e1db60d37dde754138a86121
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>

4 files changed, 86 insertions, 2 deletions

diff --git a/vid-app-common/src/test/resources/csars/service-MnsVnn1bDmzSvc-csar.csar b/vid-app-common/src/test/resources/csars/service-MnsVnn1bDmzSvc-csar.csar
new file mode 100644
index 000000000..b7b011a07
--- /dev/null
+++ b/vid-app-common/src/test/resources/csars/service-MnsVnn1bDmzSvc-csar.csar
diff --git a/vid-app-common/src/test/resources/csars/service-MnsVnn1bExnSvc-csar.csar b/vid-app-common/src/test/resources/csars/service-MnsVnn1bExnSvc-csar.csar
new file mode 100644
index 000000000..c680bc47f
--- /dev/null
+++ b/vid-app-common/src/test/resources/csars/service-MnsVnn1bExnSvc-csar.csar
diff --git a/vid-app-common/src/test/resources/vlan-tagging.json b/vid-app-common/src/test/resources/vlan-tagging.json
index 454327aa3..6789e646b 100644
--- a/vid-app-common/src/test/resources/vlan-tagging.json
+++ b/vid-app-common/src/test/resources/vlan-tagging.json
@@ -138,7 +138,7 @@
     }
   },
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
@@ -219,4 +219,4 @@
   "volumeGroups": {},
   "pnfs": {},
   "vnfGroups": {}
-}
\ No newline at end of file
+}
diff --git a/vid-app-common/src/test/resources/vrf-csar.json b/vid-app-common/src/test/resources/vrf-csar.json
new file mode 100644
index 000000000..b1d4e4508
--- /dev/null
+++ b/vid-app-common/src/test/resources/vrf-csar.json
@@ -0,0 +1,84 @@
+{
+  "service":{
+    "uuid":"f028b2e2-7080-4b13-91b2-94944d4c42d8",
+    "invariantUuid":"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+    "name":"infraVPN",
+    "version":"1.0",
+    "toscaModelURL":null,
+    "category":"Network Service",
+    "serviceType":"INFRASTRUCTURE-VPN",
+    "serviceRole":"BONDING",
+    "description":"ddd",
+    "serviceEcompNaming":"true",
+    "instantiationType":"A-La-Carte",
+    "inputs":{
+
+    }
+  },
+  "vnfs":{
+
+  },
+  "networks":{
+
+  },
+  "collectionResources": {
+  },
+  "configurations":{
+
+  },
+  "fabricConfigurations":{
+
+  },
+  "serviceProxies":{
+    "misvpn_service_proxy 0":{
+      "uuid":"35186eb0-e6b6-4fa5-86bb-1501b342a7b1",
+      "invariantUuid":"73f89e21-b96c-473f-8884-8b93bcbd2f76",
+      "description":"A Proxy for Service MISVPN_SERVICE",
+      "name":"MISVPN_SERVICE Service Proxy",
+      "version":"3.0",
+      "customizationUuid":"4c2fb7e0-a0a5-4b32-b6ed-6a974e55d923",
+      "inputs":{
+
+      },
+      "commands":{
+
+      },
+      "properties":{
+        "ecomp_generated_naming":"false"
+      },
+      "type":"Service Proxy",
+      "sourceModelUuid":"d5cc7d15-c842-450e-95ae-2a69e66dd23b",
+      "sourceModelInvariant":"c126ec86-59fe-48c0-9532-e39a9b3e5272",
+      "sourceModelName":"MISVPN_SERVICE"
+    }
+  },
+  "vfModules":{
+  },
+  "volumeGroups":{
+
+  },
+  "pnfs":{
+
+  },
+  "vnfGroups":{
+
+  },
+  "vrfs":{
+    "VRF Entry Configuration 0": {
+      "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
+      "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a",
+      "description": "VRF Entry configuration object",
+      "name": "VRF Entry Configuration",
+      "version": "30.0",
+      "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "ecomp_generated_naming": "false",
+        "role":"INFRASTRUCTURE-CLOUD-VPN",
+        "type":"VRF-ENTRY"
+      },
+      "type": "Configuration"
+    }
+  }
+}
\ No newline at end of file