Sync Integ to Master

Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>

3 files changed, 0 insertions, 59 deletions

diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json
deleted file mode 100644
index af216b7c21..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/myCompute.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "payloadName": "normative-types-new-myCompute.yml",
-  "contactId": "jh0003",
-  "name": "tosca.nodes.MyCompute",
-  "description": "Represents a real or virtual machine or server. Information specified on the Compute
-      node will be used to find the machine that fits the given requirements in the cloud
-      available machines. If no sizing information are specified the cloud provider default
-      machine will be used. It is strongly recommended to specify the required  CPUs and memory
-      at least.",
-  "resourceIconPath": "defaulticon",
-  "categories": [
-  {
-    "name": "Generic",
-    "subcategories": [
-      {
-        "name": "Infrastructure"
-      }
-    ]
-  }
-],
-  "tags": [
-    "tosca.nodes.MyCompute"
-  ]
-}
\ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml
deleted file mode 100644
index dff93f621a..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types: 
-  tosca.nodes.MyCompute:
-    derived_from: tosca.nodes.Root
-    attributes:
-      private_address:
-        type: string
-      public_address:
-        type: string
-      networks:
-        type: map
-        entry_schema:
-          type: tosca.datatypes.network.NetworkInfo
-      ports:
-        type: map
-        entry_schema:
-          type: tosca.datatypes.network.PortInfo
-    requirements:
-      - local_storage: 
-          capability: tosca.capabilities.Attachment
-          node: tosca.nodes.BlockStorage
-          relationship: tosca.relationships.AttachesTo
-          occurrences: [0, UNBOUNDED]  
-    capabilities:
-      host: 
-        type: tosca.capabilities.Container
-        valid_source_types: [tosca.nodes.SoftwareComponent] 
-      endpoint :
-        type: tosca.capabilities.Endpoint.Admin 
-      os: 
-        type: tosca.capabilities.OperatingSystem
-      scalable:
-        type: tosca.capabilities.Scalable
-      binding:
-        type: tosca.capabilities.network.Bindable
diff --git a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip b/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip
deleted file mode 100644
index a4fb8979fc..0000000000
--- a/asdc-tests/src/test/resources/CI/importResourceTests/myCompute/normative-types-new-myCompute.zip
+++ /dev/null