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, 37 deletions

diff --git a/asdc-tests/src/test/resources/CI/importResource/DBMS/DBMS.json b/asdc-tests/src/test/resources/CI/importResource/DBMS/DBMS.json
deleted file mode 100644
index 790a30ab42..0000000000
--- a/asdc-tests/src/test/resources/CI/importResource/DBMS/DBMS.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "payloadName": "normative-types-new-DBMS.yml",
-  "contactId": "jh0003",
-  "name": "DBMS",
-  "description": "Represents a typical relational, SQL Database Management System software component or service.",
-  "resourceIconPath": "defaulticon",
-  "categories": [
-  {
-    "name": "Generic",
-    "subcategories": [
-      {
-        "name": "Abstract"
-      }
-    ]
-  }
-],
-  "tags": [
-    "DBMS"
-  ]
-}
\ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/importResource/DBMS/normative-types-new-DBMS.yml b/asdc-tests/src/test/resources/CI/importResource/DBMS/normative-types-new-DBMS.yml
deleted file mode 100644
index 28919d38e4..0000000000
--- a/asdc-tests/src/test/resources/CI/importResource/DBMS/normative-types-new-DBMS.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-node_types: 
-  tosca.nodes.DBMS:
-    derived_from: tosca.nodes.SoftwareComponent
-    properties:
-      root_password: 
-        type: string
-        required: false
-        description: the optional root password for the DBMS service
-      port:
-        type: integer
-        required: false
-        description: the port the DBMS service will listen to for data and requests 
-    capabilities:    
-      host: 
-        type: tosca.capabilities.Container
-        valid_source_types: [ tosca.nodes.Database ]
diff --git a/asdc-tests/src/test/resources/CI/importResource/DBMS/normative-types-new-DBMS.zip b/asdc-tests/src/test/resources/CI/importResource/DBMS/normative-types-new-DBMS.zip
deleted file mode 100644
index 84bddbce47..0000000000
--- a/asdc-tests/src/test/resources/CI/importResource/DBMS/normative-types-new-DBMS.zip
+++ /dev/null