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

diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.json b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.json
deleted file mode 100644
index 19e4669a38..0000000000
--- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "payloadName": "router.yml",
-  "contactId": "jh0003",
-  "resourceName": "org.openecomp.asdc.nodes.Router",
-  "description": "Represents a Router Node Type.",
-  "resourceIconPath": "defaulticon",
-  "category": "Infrastructure",
-  "tags": [
-    "org.openecomp.asdc.nodes.Router"
-  ]
-}
\ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.yml b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.yml
deleted file mode 100644
index 0598663c64..0000000000
--- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-org.openecomp.asdc.nodes.Router:
-  #The Router node has a property "routing_table" which is a list. The entry of the routing_table is the customized data type "RoutingTableEntry"
-    derived_from: org.openecomp.asdc.nodes.Root
-    properties: 
-      routing_table: 
-        type: list
-      entry_schema:
-      #"entry_schema" is the TOSCA spec to describe the type of the list item
-        type: RoutingTableEntry
-    capabilities:
-      connectTo: 
-        #The "connectTo" capability allows other TOSCA nodes (connectors) that requires such a capability to connect to this node.    
-        type: org.openecomp.asdc.capabilities.Endpoint
\ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.zip b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.zip
deleted file mode 100644
index f6e2fff528..0000000000
--- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/router/router.zip
+++ /dev/null