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

diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.json b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.json
deleted file mode 100644
index 35b426c831..0000000000
--- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "payloadName": "VNF.yml",
-  "contactId": "jh0003",
-  "resourceName": "org.openecomp.asdc.nodes.VNF",
-  "description": "Represents a VNF Node Type.",
-  "resourceIconPath": "defaulticon",
-  "category": "Infrastructure",
-  "tags": [
-    "org.openecomp.asdc.nodes.VNF"
-  ]
-}
\ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.yml b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.yml
deleted file mode 100644
index 22be623303..0000000000
--- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-org.openecomp.asdc.nodes.VNF:
-  #The VNF node is required to be hosted by a VNF_Container
-    derived_from: org.openecomp.asdc.nodes.Root
-    properties:
-      service_name:
-        type: string
-    attributes:
-      #attribute means the value is fulfilled at run-time. 
-      service_id:
-      #In this case, we consider the VNF node only has the service_id value when the node is instantiated
-        type: string
-    requirements:
-      #the "host" requirement can establish the relationship with a VNF_Container node
-      - host :
-          capability: org.openecomp.asdc.capabilities.Container
-          node: org.openecomp.asdc.nodes.VNF_Container 
\ No newline at end of file
diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.zip b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.zip
deleted file mode 100644
index 95183b48d3..0000000000
--- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/VNF/VNF.zip
+++ /dev/null