[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

6 files changed, 50 insertions, 0 deletions

diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml
new file mode 100644
index 0000000000..120f33d5f1
--- /dev/null
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.yml
@@ -0,0 +1,23 @@
+services:
+    Mobility:
+      name: "Mobility1"
+      icons: ['mobility']
+    Network_L1_3:
+      name: "Network L1-31"
+      icons: ['network_l_1-3']
+resources:
+  NetworkLayer23:
+    name: "Network Layer 2-31"
+    subcategories: 
+      Router:
+          name: "Router"
+          icons: ['router']
+      Gateway:
+          name: "Gateway"
+          icons: ['gateway']
+      WAN_Connectors:
+          name: "WAN Connectors"
+          icons: ['connector']
+      LAN_Connectors:
+          name: "LAN Connectors"
+          icons: ['connector']
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip b/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip
new file mode 100644
index 0000000000..68b7aa9114
--- /dev/null
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/categoryTypesTest.zip
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml
new file mode 100644
index 0000000000..484ed4dff6
--- /dev/null
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.yml
@@ -0,0 +1,13 @@
+org.openecomp.groups.MyHeatStack1:
+  derived_from: tosca.groups.Root
+  description: Grouped all heat resources which are in the same heat stack
+  properties:
+    heat_files:
+      type: list
+      description: Heat files which associate to this group/heat stack
+      required: true
+      status: SUPPORTED
+      entry_schema:
+        type: string
+    url_credential:
+      type: tosca.datatypes.Credential
\ No newline at end of file
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip
new file mode 100644
index 0000000000..2619853f4b
--- /dev/null
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack1/myHeatStack1.zip
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml
new file mode 100644
index 0000000000..94fbb0451e
--- /dev/null
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.yml
@@ -0,0 +1,14 @@
+org.openecomp.groups.MyHeatStack2:
+  derived_from: tosca.groups.Root
+  description: Grouped all heat resources which are in the same heat stack
+  members: [ tosca.nodes.Compute ]
+  properties:
+    heat_files:
+      type: list
+      description: Heat files which associate to this group/heat stack
+      required: true
+      status: SUPPORTED
+      entry_schema:
+        type: string
+    url_credential:
+      type: tosca.datatypes.Credential
\ No newline at end of file
diff --git a/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip
new file mode 100644
index 0000000000..7f43af70eb
--- /dev/null
+++ b/test-apis-ci/src/test/resources/CI/importTypesTest/myHeatStack2/myHeatStack2.zip