[VID-55] Upgrade Tosca Parser (merge)

Change-Id: I5389f1641ef22df3ed569a154b3c367117c04d04
Signed-off-by: Ofir Sonsino <os0695@att.com>

4 files changed, 268 insertions, 0 deletions

diff --git a/vid-app-common/src/test/resources/asdc.properties b/vid-app-common/src/test/resources/asdc.properties
new file mode 100644
index 000000000..8352ff213
--- /dev/null
+++ b/vid-app-common/src/test/resources/asdc.properties
@@ -0,0 +1,6 @@
+asdc.client.type=REST
+
+asdc.client.rest.protocol=http
+asdc.client.rest.host=c2.vm1.sdc.simpledemo.openecomp.org
+asdc.client.rest.port=8080
+asdc.client.rest.auth=Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
diff --git a/vid-app-common/src/test/resources/sampleTosca.csar b/vid-app-common/src/test/resources/sampleTosca.csar
new file mode 100644
index 000000000..d9c469a15
--- /dev/null
+++ b/vid-app-common/src/test/resources/sampleTosca.csar
diff --git a/vid-app-common/src/test/resources/vf-csar.JSON b/vid-app-common/src/test/resources/vf-csar.JSON
new file mode 100644
index 000000000..bd1a01935
--- /dev/null
+++ b/vid-app-common/src/test/resources/vf-csar.JSON
@@ -0,0 +1,153 @@
+{
+  "networks": {
+  },
+  "service": {
+    "category": "Mobility",
+    "description": "Bla bla",
+    "inputs": {
+      "greatdefect0_availability_zone_max_count": {
+        "constraints": [
+        ],
+        "default": 1,
+        "description": "",
+        "entry_schema": null,
+        "required": true,
+        "type": "integer"
+      },
+      "greatdefect0_itc_name_0": {
+        "constraints": [
+        ],
+        "default": "ab",
+        "description": "ixla itc instance name",
+        "entry_schema": null,
+        "required": true,
+        "type": "string"
+      },
+      "greatdefect0_vf_module_id": {
+        "constraints": [
+        ],
+        "default": "abc",
+        "description": "Unique ID for this VF Module instance",
+        "entry_schema": null,
+        "required": true,
+        "type": "string"
+      }
+    },
+    "invariantUuid": "bd9bf71a-df22-4c95-8638-89f15d875395",
+    "name": "Moriya_new_test",
+    "serviceEcompNaming": "true",
+    "toscaModelURL": null,
+    "uuid": "48a52540-8772-4368-9cdb-1f124ea5c931",
+    "version": "1.0"
+  },
+  "vfModules": {
+    "greatdefect0..Greatdefect..base_ixla..module-0": {
+      "commands": {
+      },
+      "customizationUuid": "316e323d-611d-4007-a647-b1d2ecdaee9e",
+      "description": null,
+      "invariantUuid": "80ff85fb-cb11-42cb-9737-e47095d42756",
+      "modelCustomizationName": "Greatdefect..base_ixla..module-0",
+      "name": "Greatdefect..base_ixla..module-0",
+      "uuid": "01166434-ef34-4969-aaf2-626203d72e48",
+      "version": "3",
+      "volumeGroupAllowed": false
+    },
+    "greatdefect0..Greatdefect..module_1_ixla..module-2": {
+      "commands": {
+      },
+      "customizationUuid": "1106fca3-235a-4f92-8d5a-960a7336b32f",
+      "description": null,
+      "invariantUuid": "e0297a51-c670-452e-b31c-c5b37c6ad40f",
+      "modelCustomizationName": "Greatdefect..module_1_ixla..module-2",
+      "name": "Greatdefect..module_1_ixla..module-2",
+      "uuid": "6f09e053-56a6-4fbb-8299-e1de616825cc",
+      "version": "3",
+      "volumeGroupAllowed": false
+    },
+    "greatdefect0..Greatdefect..module_2_ixla..module-1": {
+      "commands": {
+      },
+      "customizationUuid": "b52c1fda-fbbf-4de3-ad9b-190d4a14990c",
+      "description": null,
+      "invariantUuid": "23befc6e-aa97-4004-b215-4979c3f84913",
+      "modelCustomizationName": "Greatdefect..module_2_ixla..module-1",
+      "name": "Greatdefect..module_2_ixla..module-1",
+      "uuid": "dea8e41f-c996-4557-b521-263210d96baa",
+      "version": "3",
+      "volumeGroupAllowed": false
+    }
+  },
+  "vnfs": {
+    "greatdefect 0": {
+      "commands": {
+        "availability_zone_max_count": {
+          "command": "get_input",
+          "displayName": "availability_zone_max_count",
+          "inputName": "greatdefect0_availability_zone_max_count"
+        },
+        "itc_name_0": {
+          "command": "get_input",
+          "displayName": "itc_name_0",
+          "inputName": "greatdefect0_itc_name_0"
+        },
+        "vf_module_id": {
+          "command": "get_input",
+          "displayName": "vf_module_id",
+          "inputName": "greatdefect0_vf_module_id"
+        }
+      },
+      "customizationUuid": "9123ced3-fbcd-42f7-b103-5965c54bbd66",
+      "description": "checl-IdanWithSecondFix",
+      "inputs": {
+        "availability_zone_max_count": {
+          "constraints": [
+          ],
+          "default": 1,
+          "description": "",
+          "entry_schema": null,
+          "required": true,
+          "type": "integer"
+        },
+        "itc_name_0": {
+          "constraints": [
+          ],
+          "default": "ab",
+          "description": "ixla itc instance name",
+          "entry_schema": null,
+          "required": true,
+          "type": "string"
+        },
+        "vf_module_id": {
+          "constraints": [
+          ],
+          "default": "abc",
+          "description": "Unique ID for this VF Module instance",
+          "entry_schema": null,
+          "required": true,
+          "type": "string"
+        }
+      },
+      "invariantUuid": "d149c45a-b42f-419a-9fac-f9c359fc2034",
+      "modelCustomizationName": "greatdefect 0",
+      "name": "greatdefect",
+      "properties": {
+        "availability_zone_max_count": "get_input:greatdefect0_availability_zone_max_count",
+        "itc_flavor_name": "nv.c8r24d160",
+        "itc_image_name": "NIMBUS_IXLA-ITC_8.20_EA_KVM_210117.qcow2",
+        "itc_name_0": "get_input:greatdefect0_itc_name_0",
+        "itm_flavor_name": "nv.c2r4d50",
+        "itm_image_name": "NIMBUS_IXLA-ITM_8.20.EA_KVM.qcow2",
+        "vf_module_id": "get_input:greatdefect0_vf_module_id"
+      },
+      "uuid": "3b25707a-d345-4a80-8744-73adf8f2e67b",
+      "version": "3.0",
+      "vfModules": {
+      },
+      "volumeGroups": {
+      }
+    }
+  },
+  "volumeGroups": {
+  }
+}
diff --git a/vid-app-common/src/test/resources/vl-csar.JSON b/vid-app-common/src/test/resources/vl-csar.JSON
new file mode 100644
index 000000000..ce1f1b79f
--- /dev/null
+++ b/vid-app-common/src/test/resources/vl-csar.JSON
@@ -0,0 +1,109 @@
+{
+    "networks": {
+        "ExtVL 0": {
+            "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",
+                    "inputName": "extvl0_network_role"
+                },
+                "network_scope": {
+                    "command": "get_input",
+                    "displayName": "network_scope",
+                    "inputName": "extvl0_network_scope"
+                }
+            },
+            "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": {
+                    "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"
+                },
+                "network_role": {
+                    "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"
+                },
+                "network_scope": {
+                    "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": {
+        "category": "Network L1-3",
+        "description": "dsfg",
+        "inputs": {
+            "extvl0_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"
+            },
+            "extvl0_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"
+            },
+            "extvl0_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"
+            }
+        },
+        "invariantUuid": "d752a44c-ac7b-4bda-8111-fb52312d101e",
+        "name": "Macro_flow_test",
+        "serviceEcompNaming": "true",
+        "toscaModelURL": null,
+        "uuid": "68101369-6f08-4e99-9a28-fa6327d344f3",
+        "version": "1.0"
+    },
+    "vfModules": {
+    },
+    "vnfs": {
+    },
+    "volumeGroups": {
+    }
+}