From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../LAN_Connector/LAN_Connector.json | 11 ---------- .../LAN_Connector/LAN_Connector.yml | 23 --------------------- .../LAN_Connector/LAN_Connector.zip | Bin 493 -> 0 bytes 3 files changed, 34 deletions(-) delete mode 100644 asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.json delete mode 100644 asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.yml delete mode 100644 asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.zip (limited to 'asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector') diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.json b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.json deleted file mode 100644 index 1bf593852b..0000000000 --- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "LAN_Connector.yml", - "contactId": "jh0003", - "resourceName": "org.openecomp.asdc.nodes.Connector.LAN_Connector", - "description": "Represents a LAN_Connector Node Type.", - "resourceIconPath": "defaulticon", - "category": "Infrastructure", - "tags": [ - "org.openecomp.asdc.nodes.Connector.LAN_Connector" - ] -} \ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.yml b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.yml deleted file mode 100644 index 4fff368cdc..0000000000 --- a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.yml +++ /dev/null @@ -1,23 +0,0 @@ -org.openecomp.asdc.nodes.Connector.LAN_Connector: - #The LAN_Connector node connects Router and VNF_Container - derived_from: org.openecomp.asdc.nodes.Connector - properties: - network_id: - #or called: vlan_id - type: string - required: true - network_type: - #The technology types used by LAN connector - type: string - attributes: - network_ip_address: - #ip address is generated only after the node is instantiated at run-time - type: string - requirements: - - connectToRouter : - capability: tosca.capabilities.Root - node: org.openecomp.asdc.nodes.Router - - connectToVNF : - capability: tosca.capabilities.Root - node: org.openecomp.asdc.nodes.VNF_Container - #These two explicit requirements specify the LAN_Connector has two "connectTo" to connect to the node of Router type and VNF_Container type respectively diff --git a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.zip b/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.zip deleted file mode 100644 index 09c3709ace..0000000000 Binary files a/asdc-tests/src/test/resources/CI/demoResourcesWanLan/LAN_Connector/LAN_Connector.zip and /dev/null differ -- cgit 1.2.3-korg