diff options
| author |   Michael Lando <ml636r@att.com> | 2018-03-04 14:53:33 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-03-07 13:19:05 +0000 |
| commit | a5445100050e49e83f73424198d73cd72d672a4d (patch) | |
| tree | cacf4df817df31be23e4e790d1dda857bdae061e /asdc-tests/src/test/resources/CI/importResource-MMSC | |
| parent | 51157f92c21976cba4914c378aaa3cba49826931 (diff) | |
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'asdc-tests/src/test/resources/CI/importResource-MMSC')
49 files changed, 0 insertions, 415 deletions
diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.capabilities.yaml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.capabilities.yaml deleted file mode 100644 index 073eba5ee7..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.capabilities.yaml +++ /dev/null @@ -1,13 +0,0 @@ -asdc.capabilities.NetworkInterface: - derived_from: tosca.capabilities.Root - -asdc.capabilities.Container: - derived_from: tosca.capabilities.Container - -# binding a VDU to a CP -asdc.capabilities.nfv.VirtualBindable: - derived_from: tosca.capabilities.Root - -# linking a VL to a CP -asdc.capabilities.nfv.VirtualLinkable: - derived_from: tosca.capabilities.Root diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.json deleted file mode 100644 index e1727aca5c..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "asdc.nodes.Module.yml", - "contactId": "jh0003", - "name": "asdc.nodes.Module", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "asdc.nodes.Module", "module" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.yml deleted file mode 100644 index b95156b5e1..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.yml +++ /dev/null @@ -1,2 +0,0 @@ -asdc.nodes.Module: - derived_from: tosca.nodes.Root diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.zip Binary files differdeleted file mode 100644 index 08003f1af8..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Module/asdc.nodes.Module.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.json deleted file mode 100644 index c52bbeebc2..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "asdc.nodes.Network.yml", - "contactId": "jh0003", - "name": "asdc.nodes.Network", - "description": "This is the default AT&T TOSCA Network Node Type that all other AT&T Network TOSCA nodes should extends.", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "asdc.nodes.Network", "Network" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.yml deleted file mode 100644 index 0e56ef7bf2..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.yml +++ /dev/null @@ -1,2 +0,0 @@ -asdc.nodes.Network: - derived_from: tosca.nodes.Root diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.zip Binary files differdeleted file mode 100644 index 9b7fa35c2e..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Network/asdc.nodes.Network.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.json deleted file mode 100644 index 5e1dda7106..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "payloadName": "asdc.nodes.Root.yml", - "contactId": "jh0003", - "name": "asdc.nodes.Root", - "description": "This is the default (root) AT&T TOSCA Node Type that all other AT&T TOSCA nodes should extends. - This allows all AT&T TOSCA nodes to have a consistent set of features for modeling and management (e.g, consistent definitions for requirements, capabilities, and lifecycle interfaces).", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "asdc.nodes.Root" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.yml deleted file mode 100644 index ed8e1e46aa..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.yml +++ /dev/null @@ -1,3 +0,0 @@ -asdc.nodes.Root: - derived_from: tosca.nodes.Root - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.zip Binary files differdeleted file mode 100644 index 8453bf3843..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.Root/asdc.nodes.Root.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.json deleted file mode 100644 index 7a122a57cd..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.module.ECA_OAM.yml", - "contactId": "jh0003", - "name": "asdc.nodes.module.ECA_OAM", - "description": "Operation, Administration & Management of vMMSC ECA TRX", - "resourceIconPath": "applicationServer", - "category": "Application Layer 4+/Application Servers", - "tags": [ - "asdc.nodes.module.ECA_OAM", "MMSC OAM", "ECA", "MMSC", "vMMSC", "Mobility" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.yml deleted file mode 100644 index 054c98439c..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.yml +++ /dev/null @@ -1,9 +0,0 @@ -asdc.nodes.module.ECA_OAM: - derived_from: asdc.nodes.Module - requirements: - - oam_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.OAM - - internal_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Internal diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.zip Binary files differdeleted file mode 100644 index 389ef18bae..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_OAM/asdc.nodes.module.ECA_OAM.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.json deleted file mode 100644 index 338099286f..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.module.ECA_TRX.yml", - "contactId": "jh0003", - "name": "asdc.nodes.module.ECA_TRX", - "description": "External Content Adaption Transcoder. Transcodes and adapts MMS content according to the capabilities of receiving MS or UE.", - "resourceIconPath": "applicationServer", - "category": "Application Layer 4+/Application Servers", - "tags": [ - "asdc.nodes.module.ECA_TRX", "Content Adaptation Transcoder", "MMSC", "vMMSC", "Mobility" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.yml deleted file mode 100644 index e2a520dc1d..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.yml +++ /dev/null @@ -1,12 +0,0 @@ -asdc.nodes.module.ECA_TRX: - derived_from: asdc.nodes.Module - requirements: - - oam_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.OAM - - traffic_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Traffic - - internal_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Internal diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.zip Binary files differdeleted file mode 100644 index f7911beb8f..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.ECA_TRX/asdc.nodes.module.ECA_TRX.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.json deleted file mode 100644 index 8ce0b8a961..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.module.F5_LTM.yml", - "contactId": "jh0003", - "name": "asdc.nodes.module.F5_LTM", - "description": "vMMSC Local Traffic Manager serves as the load balancer for traffic coming into the vMMSC. Traffic from MMSC designated to external network passes via F5. Also, internal communication between ECA and MMSC is via F5", - "resourceIconPath": "loadBalancer", - "category": "Application Layer 4+/Load Balancer", - "tags": [ - "asdc.nodes.module.F5_LTM", "F5", "Load Balancer", "vMMSC", "Mobility" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.yml deleted file mode 100644 index c50cd0a481..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.yml +++ /dev/null @@ -1,12 +0,0 @@ -asdc.nodes.module.F5_LTM: - derived_from: asdc.nodes.Module - requirements: - - core_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Core - - dmz_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.DMZ - - traffic_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Traffic diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.zip Binary files differdeleted file mode 100644 index 2bb9bbaa03..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.F5_LTM/asdc.nodes.module.F5_LTM.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.json deleted file mode 100644 index 4103880abf..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.module.MMSC.yml", - "contactId": "jh0003", - "name": "asdc.nodes.module.MMSC", - "description": "Accepts MMS messages via F5 and distributes among MMSCs. Messages are from user mobile device or from another Message Service", - "resourceIconPath": "applicationServer", - "category": "Application Layer 4+/Application Servers", - "tags": [ - "asdc.nodes.module.MMSC", "MMSC", "vMMSC", "Mobility" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.yml deleted file mode 100644 index b65b20f5b2..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.yml +++ /dev/null @@ -1,12 +0,0 @@ -asdc.nodes.module.MMSC: - derived_from: asdc.nodes.Module - requirements: - - oam_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.OAM - - cinder_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Cinder - - traffic_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Traffic diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.zip Binary files differdeleted file mode 100644 index abf8dd8ced..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.MMSC/asdc.nodes.module.MMSC.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.json deleted file mode 100644 index a289e4dd1b..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.module.NEMS_BE.yml", - "contactId": "jh0003", - "name": "asdc.nodes.module.NEMS_BE", - "description": "The Back End of a Network Message Storage allows external multimedia content to use SMTP e-mail mechanism to submit MMS messages", - "resourceIconPath": "applicationServer", - "category": "Application Layer 4+/Application Servers", - "tags": [ - "asdc.nodes.module.NEMS_BE", "MMSC", "vMMSC", "Network Message Storage", "Back End", "Mobility" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.yml deleted file mode 100644 index b460bf57a5..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.yml +++ /dev/null @@ -1,9 +0,0 @@ -asdc.nodes.module.NEMS_BE: - derived_from: asdc.nodes.Module - requirements: - - oam_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.OAM - - internal_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Internal diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.zip Binary files differdeleted file mode 100644 index 2ee35f5cde..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_BE/asdc.nodes.module.NEMS_BE.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.json deleted file mode 100644 index 4d80b25712..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "asdc.nodes.module.NEMS_FE.yml", - "contactId": "jh0003", - "name": "asdc.nodes.module.NEMS_FE", - "description": "The Front End of a Network Message Storage allows external multimedia content to use SMTP e-mail mechanism to submit MMS messages", - "resourceIconPath": "objectStorage", - "category": "Application Layer 4+/Application Servers", - "tags": [ - "asdc.nodes.module.NEMS_FE", "MMSC", "vMMSC", "Network Message Storage", "Front End", "Mobility" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.yml deleted file mode 100644 index 256aa7e4a3..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.yml +++ /dev/null @@ -1,15 +0,0 @@ -asdc.nodes.module.NEMS_FE: - derived_from: asdc.nodes.Module - requirements: - - oam_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.OAM - - cinder_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Cinder - - traffic_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Traffic - - internal_connection: - capability: asdc.capabilities.NetworkInterface - node: asdc.nodes.network.Internal diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.zip Binary files differdeleted file mode 100644 index 28eb1ccb60..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.module.NEMS_FE/asdc.nodes.module.NEMS_FE.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.json deleted file mode 100644 index 1538d93b2a..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.network.Cinder.yml", - "contactId": "jh0003", - "name": "asdc.nodes.network.Cinder", - "description": "Represents access to Cloud shared storae.", - "resourceIconPath": "network", - "category": "Generic/Network Elements", - "tags": [ - "asdc.nodes.network.Cinder", "Network", "Cinder", "Cloud" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.yml deleted file mode 100644 index 54b34d23fe..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.yml +++ /dev/null @@ -1,5 +0,0 @@ -asdc.nodes.network.Cinder: - derived_from: asdc.nodes.Network - capabilities: - cinder_connection: - type: asdc.capabilities.NetworkInterface diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.zip Binary files differdeleted file mode 100644 index 5210a39f29..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Cinder/asdc.nodes.network.Cinder.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.json deleted file mode 100644 index 343a785b6f..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.network.Core.yml", - "contactId": "jh0003", - "name": "asdc.nodes.network.Core", - "description": "Represents Cloud Core network which provide interface to other services.", - "resourceIconPath": "network", - "category": "Generic/Network Elements", - "tags": [ - "asdc.nodes.network.Core", "Network", "Core", "Cloud" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.yml deleted file mode 100644 index ac4ceed23e..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.yml +++ /dev/null @@ -1,5 +0,0 @@ -asdc.nodes.network.Core: - derived_from: asdc.nodes.Network - capabilities: - core_connection: - type: asdc.capabilities.NetworkInterface diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.zip Binary files differdeleted file mode 100644 index 7482fee585..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Core/asdc.nodes.network.Core.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.json deleted file mode 100644 index 50041339b6..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.network.DMZ.yml", - "contactId": "jh0003", - "name": "asdc.nodes.network.DMZ", - "description": "Represents DMZ network.", - "resourceIconPath": "network", - "category": "Generic/Network Elements", - "tags": [ - "asdc.nodes.network.DMZ", "Network", "DMZ", "Cloud" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.yml deleted file mode 100644 index df41ae4072..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.yml +++ /dev/null @@ -1,5 +0,0 @@ -asdc.nodes.network.DMZ: - derived_from: asdc.nodes.Network - capabilities: - dmz_connection: - type: asdc.capabilities.NetworkInterface diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.zip Binary files differdeleted file mode 100644 index fab96c9a64..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.DMZ/asdc.nodes.network.DMZ.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.json deleted file mode 100644 index a2cf1c8026..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "asdc.nodes.network.Internal.yml", - "contactId": "jh0003", - "name": "asdc.nodes.network.Internal", - "description": "Represents Internal Network", - "resourceIconPath": "network", - "category": "Generic/Network Elements", - "tags": [ - "asdc.nodes.network.Internal", "Network", "Cloud" - ] -} diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.yml deleted file mode 100644 index 01b6dece24..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.yml +++ /dev/null @@ -1,5 +0,0 @@ - asdc.nodes.network.Internal: - derived_from: asdc.nodes.Network - capabilities: - dmz_connection: - type: asdc.capabilities.NetworkInterface diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.zip Binary files differdeleted file mode 100644 index 2317ce5ad0..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Internal/asdc.nodes.network.Internal.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.json deleted file mode 100644 index bb9560be88..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "payloadName": "asdc.nodes.network.OAM.yml", - "contactId": "jh0003", - "name": "asdc.nodes.network.OAM", - "description": "Represents Operation, Administration and Management (OA&M) network.", - "resourceIconPath": "network", - "category": "Generic/Network Elements", - "tags": [ - "asdc.nodes.network.OAM", "Network", "OAM", "Cloud" - ] -} - diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.yml deleted file mode 100644 index 0a0875ad07..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.yml +++ /dev/null @@ -1,5 +0,0 @@ -asdc.nodes.network.OAM: - derived_from: asdc.nodes.Network - capabilities: - oam_connection: - type: asdc.capabilities.NetworkInterface diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.zip Binary files differdeleted file mode 100644 index b2fbb78a7c..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.OAM/asdc.nodes.network.OAM.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.json b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.json deleted file mode 100644 index fb8269039c..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "asdc.nodes.network.Traffic.yml", - "contactId": "jh0003", - "name": "asdc.nodes.network.Traffic", - "description": "Represents Network Traffic", - "resourceIconPath": "network", - "category": "Generic/Network Elements", - "tags": [ - "asdc.nodes.network.Traffic", "Network", "Cloud" - ] -} diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.yml b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.yml deleted file mode 100644 index b50bc8e612..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.yml +++ /dev/null @@ -1,5 +0,0 @@ -asdc.nodes.network.Traffic: - derived_from: asdc.nodes.Network - capabilities: - dmz_connection: - type: asdc.capabilities.NetworkInterface diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.zip Binary files differdeleted file mode 100644 index 3add4e6ade..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/asdc.nodes.network.Traffic/asdc.nodes.network.Traffic.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/capabilityTypes.zip b/asdc-tests/src/test/resources/CI/importResource-MMSC/capabilityTypes.zip Binary files differdeleted file mode 100644 index a1f0cdeee5..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/capabilityTypes.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/deleteNormative.sh b/asdc-tests/src/test/resources/CI/importResource-MMSC/deleteNormative.sh deleted file mode 100644 index fb46daa544..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/deleteNormative.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: $0 <hostIp> <hostPort> <resourceName>" -} - -function deleteResource() { - - ELEMENT_NAME=$1 - echo -e "############### Removing Element ${ELEMENT_NAME} Start ######################" - http_code=$(curl -s -o /dev/null -w "%{http_code}" -X "DELETE" -H "USER_ID: jh0003" ${HOST_IP}:${HOST_PORT}/sdc2/rest/v1/catalog/resources/res_${ELEMENT_NAME}".1.0") - if [ ${http_code} -eq 204 ]; then - echo -e "\n############### Removing Element ${ELEMENT_NAME} status code:${http_code} End #######\n\n\n" - elif [ ${http_code} -eq 500 ]; then - echo -e "\n############### Failed to remove Element ${ELEMENT_NAME} status code:${http_code} End #######\n\n\n" - exit 1 - elif [ ${http_code} -eq 404 ]; then - echo -e "\n############### Element ${ELEMENT_NAME} not found status code:${http_code} End #######\n\n\n" - else - echo -e "\n############### Failed to remove Element ${ELEMENT_NAME} status code:${http_code} End #######\n\n\n" - exit 1 - fi -} -if [ $# -lt 3 ] -then - usage - exit 2 -fi - -HOST_IP=$1 -HOST_PORT=$2 - -deleteResource $3 - -exit 0 diff --git a/asdc-tests/src/test/resources/CI/importResource-MMSC/importNormative.sh b/asdc-tests/src/test/resources/CI/importResource-MMSC/importNormative.sh deleted file mode 100644 index 9e568dddc3..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-MMSC/importNormative.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/bash - -function usage { - echo "Usage: $0 <hostIp> <hostPort> <userId>" -} - -function addResource() { - - ELEMENT_NAME=$1 - echo -e "###################### Adding Element ${ELEMENT_NAME} Start ######################" - CURRENT_ZIP_FILE=./${ELEMENT_NAME}/${ELEMENT_NAME}.zip - CURRENT_JSON_FILE=./${ELEMENT_NAME}/${ELEMENT_NAME}.json - sed -i 's/"userId": ".*",/"userId": "'${ATT_UID}'",/' ${CURRENT_JSON_FILE} - JSON_CONTENT=`paste -s ${CURRENT_JSON_FILE}` - http_code=$(curl -s -o /dev/null -w "%{http_code}" -v -F resourceMetadata="${JSON_CONTENT}" -F resourceZip=@${CURRENT_ZIP_FILE} -H USER_ID:${ATT_UID} ${HOST_IP}:${HOST_PORT}/sdc2/rest/v1/catalog/upload/multipart) - if [ ${http_code} -eq 201 ]; then - echo -e "\n###################### Adding Element ${ELEMENT_NAME} End ########################\n\n\n" - elif [ ${http_code} -eq 409 ]; then - echo -e "\n###################### Already exists Element ${ELEMENT_NAME} status code:${http_code} End ########################\n\n\n" - elif [ ${http_code} -eq 500 ]; then - echo -e "\n###################### Failed to add Element ${ELEMENT_NAME} status code:${http_code} End ########################\n\n\n" - exit 1 - fi -} -if [ $# -lt 3 ] -then - usage - exit 2 -fi - -HOST_IP=$1 -HOST_PORT=$2 -ATT_UID=$3 -NO_CAPS=$4 - -if [ "$NO_CAPS" = "nocaps" ]; then - echo "Skipping Caps import..." -else - #Add The CapabilityTypes - http_code=$(curl -s -o /dev/null -w "%{http_code}" -v -F capabilityTypeZip=@capabilityTypes.zip -H "USER_ID: jh0003" ${HOST_IP}:${HOST_PORT}/sdc2/rest/v1/catalog/uploadType/capability) - if [ ${http_code} -eq 201 ]; then - echo -e "\n###################### Adding The CapabilityTypes status code:${http_code} End ########################\n\n\n" - elif [ ${http_code} -eq 500 ]; then - echo -e "\n###################### Failed to add CapabilityTypes status code:${http_code} End ########################\n\n\n" - exit 1 - else - echo -e "\n###################### Failed to add CapabilityTypes status code:${http_code} End ########################\n\n\n" - exit 1 - fi - #Add The InterfaceLifecycleTypes - #http_code=$(curl -s -o /dev/null -w "%{http_code}" -v -F interfaceLifecycleTypeZip=@interfaceLifecycleTypes.zip -H "USER_ID: jh0003" ${HOST_IP}:${HOST_PORT}/sdc2/rest/v1/catalog/uploadType/interfaceLifecycle) - #if [ ${http_code} -eq 201 ]; then - # echo -e "\n###################### Adding The InterfaceLifecycleTypes status code:${http_code} End ########################\n\n\n" - #elif [ ${http_code} -eq 409 ]; then - # echo -e "\n###################### Already exists InterfaceLifecycleTypes status code:${http_code} End ########################\n\n\n" - #elif [ ${http_code} -eq 500 ]; then - # echo -e "\n###################### Failed to add InterfaceLifecycleTypes status code:${http_code} End ########################\n\n\n" - # exit 1 - #else - # echo -e "\n###################### Failed to add InterfaceLifecycleTypes status code:${http_code} End ########################\n\n\n" - # exit 1 - #fi -fi - -addResource "asdc.nodes.Root" -addResource "asdc.nodes.Network" -addResource "asdc.nodes.network.Cinder" -addResource "asdc.nodes.network.Core" -addResource "asdc.nodes.network.DMZ" -addResource "asdc.nodes.network.OAM" -addResource "asdc.nodes.network.Traffic" -addResource "asdc.nodes.network.Internal" -addResource "asdc.nodes.Module" -addResource "asdc.nodes.module.ECA_OAM" -addResource "asdc.nodes.module.ECA_TRX" -addResource "asdc.nodes.module.F5_LTM" -addResource "asdc.nodes.module.MMSC" -addResource "asdc.nodes.module.NEMS_BE" -addResource "asdc.nodes.module.NEMS_FE" - - - - - -exit 0 |