diff options
Diffstat (limited to 'asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix')
30 files changed, 0 insertions, 250 deletions
diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.json deleted file mode 100644 index d0f60bb7e3..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.yaml", - "attContact": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VDU.DHCPCategoryVDU", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Network Elements", - "tags": [ - "org.openecomp.resource.nfv.VDU.DHCPCategoryVDU" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.yaml deleted file mode 100644 index 04aac7300e..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.yaml +++ /dev/null @@ -1,10 +0,0 @@ -################################################################## -###################### DHCP VDU Node TYPE ############### -################################################################## - org.openecomp.resource.nfv.VDU.DHCPCategoryVDU: - derived_from: org.openecomp.resource.nfv.VDU - capabilities: #paronin - added to connect to VCE_Brocade_VDU - dhcp: - type: org.openecomp.capabilities.nfv.VNF.DHCPCapability - description: This capability has been introduced - ###############Further details described in DHCP VNF TOSCA Model
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.zip Binary files differdeleted file mode 100644 index d55698f3e6..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.json deleted file mode 100644 index ca0f2c9ea8..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VDU.DNSCategoryVDU.yaml", - "attContact": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VDU.DNSCategoryVDU", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Network Elements", - "tags": [ - "org.openecomp.resource.nfv.VDU.DNSCategoryVDU" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.yaml deleted file mode 100644 index 58aa9f3e81..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.yaml +++ /dev/null @@ -1,10 +0,0 @@ -################################################################## -###################### DNS VDU Node TYPE ############### -################################################################## - org.openecomp.resource.nfv.VDU.DNSCategoryVDU: - derived_from: org.openecomp.resource.nfv.VDU - capabilities: #paharoni - added to connect to VCE_Brocade_VDU - dns: - type: org.openecomp.capabilities.nfv.VNF.DNSCapability - description: This capability has been introduced - ###############Further details described in DNS VNF TOSCA Model
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.zip Binary files differdeleted file mode 100644 index f036a2fdd9..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.json deleted file mode 100644 index 6c0b033552..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.yaml", - "contactId": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VDU.FirewallCategoryVDU", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Network Elements", - "tags": [ - "org.openecomp.resource.nfv.VDU.FirewallCategoryVDU" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.yaml deleted file mode 100644 index f22dfcb35e..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.yaml +++ /dev/null @@ -1,10 +0,0 @@ -################################################################## -###################### Firewall VDU Node TYPE ############### -################################################################## - org.openecomp.resource.nfv.VDU.FirewallCategoryVDU: - derived_from: org.openecomp.resource.nfv.VDU - capabilities: #paharoni - added to connect to VCE_Brocade_VDU - firewall: - type: org.openecomp.capabilities.nfv.VNF.FirewallCapability - description: This capability has been introduced - ###############Further details described in Firewall VNF TOSCA Model
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.zip Binary files differdeleted file mode 100644 index aa453f0912..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.json deleted file mode 100644 index 67762f8c60..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.yaml", - "attContact": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Network Elements", - "tags": [ - "org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.yaml deleted file mode 100644 index 133ccc33b5..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.yaml +++ /dev/null @@ -1,10 +0,0 @@ -################################################################## -###################### ASDC NAT VDU Node TYPE ############### -################################################################## - org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU: #paharoni - renamed from org.openecomp.resource.nfv.VDU.NetworkAddressTranslationCategoryVDU. Resource name can be up to 50 chars in ASDC - derived_from: org.openecomp.resource.nfv.VDU - capabilities: #paharoni - added to connect to VCE_Brocade_VDU - nat: - type: org.openecomp.capabilities.nfv.VNF.NetworkAddressTranslationCapability - description: This capability has been introduced - ###############Further details described in NAT VNF TOSCA Model
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.zip Binary files differdeleted file mode 100644 index 708d8a8521..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.json deleted file mode 100644 index 26a2dd9a08..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.yaml", - "contactId": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Network Elements", - "tags": [ - "org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.yaml deleted file mode 100644 index 04aad2f848..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.yaml +++ /dev/null @@ -1,10 +0,0 @@ -################################################################## -###################### PAT VDU Node TYPE ############### -################################################################## - org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU: #paharoni - renamed from org.openecomp.resource.nfv.VDU.PortAddressTranslationCategoryVDU. Resource name can be up to 50 chars in ASDC - derived_from: org.openecomp.resource.nfv.VDU - capabilities: #paharoni - added to connect to VCE_Brocade_VDU - pat: - type: org.openecomp.capabilities.nfv.VNF.PortAddressTranslationCapability - description: This capability has been introduced - ###############Further details described in PAT VNF TOSCA Model
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.zip Binary files differdeleted file mode 100644 index ce987de81f..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.json deleted file mode 100644 index 7ea24e09f5..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VL.yaml", - "contactId": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VL", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "org.openecomp.resource.nfv.VL" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.yaml deleted file mode 100644 index 0709072040..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.yaml +++ /dev/null @@ -1,7 +0,0 @@ -################################################################## -###################### ASDC VL Node TYPE ###################### -################################################################## - org.openecomp.resource.nfv.VL: - derived_from: tosca.nodes.nfv.VL - - diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.zip Binary files differdeleted file mode 100644 index a5029cd710..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.json deleted file mode 100644 index d191fe14cc..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.yaml", - "attContact": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Network Elements", - "tags": [ - "org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.yaml deleted file mode 100644 index bbd0fe0945..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.yaml +++ /dev/null @@ -1,32 +0,0 @@ -######################################################################################################## -###################### vCE_Brocade_VNF Node TYPE ##################################################### -########### IN THE ABSENCE OF NODE TEMPLATE, the vCE_Brocade_VNF Node Type is modeled as REQUIRING: ##### -########### 1. vce_Brocade_VDU Node -########### 2. oam_vlan_connector Node -########### 3. ipag_vlan_connector Node -########### 4. vpe_vlan_connector Node -######################################################################################################## - - org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF: - derived_from: org.openecomp.resource.nfv.VNF - requirements: - - vce_brocade_vdu: - capability: org.openecomp.capabilities.nfv.VCE_Brocade_Routing - node: org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU - occurrences: [1, 1] - - - oam_vlan_connector: - capability: org.openecomp.capabilities.nfv.OAM_VLAN_Connector - node: org.openecomp.resource.nfv.CP.OAM_VLAN_Connector - occurrences: [1, 1] - - - vpe_vlan_connector: - capability: org.openecomp.capabilities.nfv.VPE_VLAN_Connector - node: org.openecomp.resource.nfv.CP.VPE_VLAN_Connector - occurrences: [1, 1] - - - ipag_vlan_connector: - capability: org.openecomp.capabilities.nfv.IPAG_VLAN_Connector - node: org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector - occurrences: [1, 1] - diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.zip Binary files differdeleted file mode 100644 index 403a7b8281..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF/org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.json deleted file mode 100644 index 2106ae9ff7..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "org.openecomp.resource.nfv.VNF.yaml", - "attContact": "jh0003", - "resourceName": "org.openecomp.resource.nfv.VNF", - "description": "Node Type that represents a Module", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "org.openecomp.resource.nfv.VNF" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.yaml deleted file mode 100644 index 6872cfc7fb..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.yaml +++ /dev/null @@ -1,5 +0,0 @@ -################################################################## -###################### ASDC VNF Node TYPE ###################### -################################################################## - org.openecomp.resource.nfv.VNF: - derived_from: tosca.nodes.nfv.VNF diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.zip Binary files differdeleted file mode 100644 index 1e14315fa7..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.json deleted file mode 100644 index e5bcfb204e..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "tosca.nodes.nfv.VL.yaml", - "contactId": "jh0003", - "resourceName": "tosca.nodes.nfv.VL", - "description": "TOSCA VL base element", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "tosca.nodes.nfv.VL" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.yaml deleted file mode 100644 index 2fbcc9c46d..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.yaml +++ /dev/null @@ -1,16 +0,0 @@ -################################################################## - ############## TOSCA VL Node Type ####################### - ################################################################## - tosca.nodes.nfv.VL: - derived_from: tosca.nodes.Root - properties: - vendor: - type: string - required: false - description: name of the vendor who provides this VL - - capabilities: - virtuallinkable: - type: tosca.capabilities.nfv.VirtualLinkable - occurrences: [1, UNBOUNDED] # this is default -
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.zip Binary files differdeleted file mode 100644 index fc7ba8d27b..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.zip +++ /dev/null diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.json deleted file mode 100644 index bd6047734c..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "payloadName": "tosca.nodes.nfv.VNF.yaml", - "contactId": "jh0003", - "resourceName": "tosca.nodes.nfv.VNF", - "description": "TOSCA VNF base element", - "resourceIconPath": "defaulticon", - "category": "Generic/Abstract", - "tags": [ - "tosca.nodes.nfv.VNF" - ] -}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.yaml deleted file mode 100644 index 5cf9453884..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.yaml +++ /dev/null @@ -1,30 +0,0 @@ -################################################################## -################### TOSCA VNF Node ########################## -################################################################## -tosca.nodes.nfv.VNF: - derived_from: tosca.nodes.Root - properties: - vnf_category: - type: string - description: Router, FW, LB, DNS are example categories - id: - type: string - description: ID of this VNF - vendor: - type: string - description: name of the vendor who provides this VNF - version: - type: version - description: version of the software for this VNF - #device_config: - # type: map - #entry_schema: - # type: string - #default: - # p1: 1 - # p2: 2 - #p3: 3 - #requirements: - # - virtualLink: - #capability: tosca.capabilities.nfv.VirtualLinkable - #occurrences: [1, UNBOUNDED]
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.zip Binary files differdeleted file mode 100644 index 3c10c5f388..0000000000 --- a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.zip +++ /dev/null |