diff options
| author |   Michael Lando <ml636r@att.com> | 2017-02-19 10:28:42 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-02-19 10:51:01 +0200 |
| commit | 451a3400b76511393c62a444f588a4ed15f4a549 (patch) | |
| tree | e4f5873a863d1d3e55618eab48b83262f874719d /asdc-tests/src/test/resources/CI/importResource-VCE-Brocade | |
| parent | 5abfe4e1fb5fae4bbd5fbc340519f52075aff3ff (diff) | |
Initial OpenECOMP SDC commit
Change-Id: I0924d5a6ae9cdc161ae17c68d3689a30d10f407b
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'asdc-tests/src/test/resources/CI/importResource-VCE-Brocade')
61 files changed, 1834 insertions, 0 deletions
diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/VCE_Brocade_Tosca.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/VCE_Brocade_Tosca.yaml new file mode 100644 index 0000000000..da71792698 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/VCE_Brocade_Tosca.yaml @@ -0,0 +1,834 @@ +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +tosca_default_namespace: Need to figure out the namespace +description: vCEBrocade and Base Types for VNF, Connection Point, Virtual Link, etc based on VNF Modeling Guidelines + +metadata: + template_name: VCE_Brocade.yaml + template_author: Kazi Farooqui (KF6593) + template_version: "0.1" + +##################################################################### +############################ Data Types ########################### +##################################################################### +#data_types: + +########################################################################################### +###################### NODE TYPE DEFINITIONS ############################################ +########################################################################################### + +node_types: + ################################################################## + ################### 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] + + ################################################################## + ################### ASDC VNF Node ########################## + ################################################################## + org.openecomp.resource.nfv.VNF: + derived_from: tosca.nodes.nfv.VNF + + + ################################################################## + ###################### TOSCA VDU Node ########################## + ################################################################## + + tosca.nodes.nfv.VDU: + derived_from: tosca.nodes.SoftwareComponent + #properties: + + capabilities: + high_availability: + type: tosca.capabilities.nfv.HA + occurrences: [1, UNBOUNDED] # this is default + + virtual_binding: + type: tosca.capabilities.nfv.VDU.VirtualBindable + occurrences: [1, UNBOUNDED] # this is default + + requirements: + - high_availability: + capability: tosca.capabilities.nfv.HA + occurrences: [0,1] + + - host: ##Is hosted in a VM + capability: tosca.capabilities.Container + node: tosca.nodes.Compute + relationship: tosca.relationships.HostedOn + occurrences: [1, 1] #this is default + + ################################################################## + ###################### ASDC VDU Node###### ###################### + ################################################################## + org.openecomp.resource.nfv.VDU: + derived_from: tosca.nodes.nfv.VDU + description: A VDU is a compute component of VNF + + ################################################################## + ####################### TOSCA CP Node ########################## + ################################################################## + tosca.nodes.nfv.CP: + derived_from: tosca.nodes.Root + properties: + type: + type: string + required: false + requirements: + - virtualbinding: + capability: tosca.capabilities.nfv.VDU.VirtualBindable + occurrences: [1, 1] #this is default + + - virtuallink: + capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [1, 1] #this is default + + attributes: + ip_address: + type: string + # required: false + + ################################################################## + ############################ ASDC CP Node ##################### + ################################################################## + org.openecomp.resource.nfv.CP: + derived_from: tosca.nodes.nfv.CP + + ################################################################## + ############### IPAG VLAN Connector CP Node ##################### + ################################################################## + org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector: + derived_from: org.openecomp.resource.nfv.CP + properties: + ipag_network_name: + type: string + + ipag_network_type: + type: string + + ipag_network_uuid: + type: string + + vlan_segment_ids: + type: list + entry_schema: + type: string + description: list of segmentation Ids. + + + #attributes: + capabilities: + dummy_capability: + type: org.openecomp.capabilities.nfv.IPAG_VLAN_Connector + description: This capability has been introduced to model this Connector as a component of VCE VNF, because Node Template is not supported by ASDC Team + + requirements: + - virtualBindingRequirement: + capability: org.openecomp.capabilities.nfv.VDU.VirtualBindable + #node: org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU + relationship: org.openecomp.relationships.nfv.VirtualBindsTo + occurrences: [1, 1] #default + + - virtualLinkingrequirement: + capability: org.openecomp.capabilities.nfv.VirtualLinkable + #node: org.openecomp.resource.nfv.VL + relationship: org.openecomp.relationships.nfv.VirtualLinksTo + occurrences: [1, 1] #default + + #interfaces: + #standard: + #configure: + #implementation: configure.sh + + ################################################################## + ############### VPE VLAN Connector CP Node ##################### + ################################################################## + org.openecomp.resource.nfv.CP.VPE_VLAN_Connector: + derived_from: org.openecomp.resource.nfv.CP + properties: + vpe_network_name: + type: string + + vpe_network_type: + type: string + + vpe_network_uuid: + type: string + + vlan_segment_ids: + type: list + entry_schema: + type: string + description: list of segmentation Ids. + + + #attributes: + capabilities: + dummy_capability: + type: org.openecomp.capabilities.nfv.VPE_VLAN_Connector + description: This capability has been introduced to model this Connector as a component of VCE VNF, because Node Template is not supported by ASDC Team + + requirements: + - virtualBindingRequirement: + capability: org.openecomp.capabilities.nfv.VDU.VirtualBindable + #node: org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU + relationship: org.openecomp.relationships.nfv.VirtualBindsTo + occurrences: [1, 1] #default + + - virtualLinkingrequirement: + capability: org.openecomp.capabilities.nfv.VirtualLinkable + #node: org.openecomp.resource.nfv.VL + relationship: org.openecomp.relationships.nfv.VirtualLinksTo + occurrences: [1, 1] #default + + #interfaces: + #standard: + #configure: + #implementation: configure.sh + ################################################################## + ############### OAM VLAN Connector CP Node ##################### + ################################################################## + org.openecomp.resource.nfv.CP.OAM_VLAN_Connector: + derived_from: org.openecomp.resource.nfv.CP + properties: + oam_network_name: + type: string + + oam_network_type: + type: string + + oam_network_uuid: + type: string + + vlan_segment_ids: + type: list + entry_schema: + type: string + description: list of segmentation Ids. + + + #attributes: + capabilities: + dummy_capability: + type: org.openecomp.capabilities.nfv.OAM_VLAN_Connector + description: This capability has been introduced to model this Connector as a component of VCE VNF, because Node Template is not supported by ASDC Team + + requirements: + - virtualBindingRequirement: + capability: org.openecomp.capabilities.nfv.VDU.VirtualBindable + #node: org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU + relationship: org.openecomp.relationships.nfv.VirtualBindsTo + occurrences: [1, 1] #default + + - virtualLinkingrequirement: + capability: org.openecomp.capabilities.nfv.VirtualLinkable + #node: org.openecomp.resource.nfv.VL + relationship: org.openecomp.relationships.nfv.VirtualLinksTo + occurrences: [1, 1] #default + + #interfaces: + #standard: + #configure: + #implementation: configure.sh + + ################################################################## + ############## 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 + +################################################################## +###################### ASDC VL Node TYPE ###################### +################################################################## + org.openecomp.resource.nfv.VL: + derived_from: tosca.nodes.nfv.VL + + +################################################################## +###################### ASDC VNF Node TYPE ###################### +################################################################## + org.openecomp.resource.nfv.VNF: + derived_from: tosca.nodes.nfv.VNF + +################################################################## +###################### ASDC Routing Category VDU ################# +################################################################## + + org.openecomp.resource.nfv.VDU.RoutingCategoryVDU: + derived_from: org.openecomp.resource.nfv.VDU + +################################################################## +###################### vCE_Brocade_VDU Node TYPE ############### +################################################################## + org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU:#paharoni - renamed from org.openecomp.resource.v/VCE_Brocade_VDU to keep convention + derived_from: org.openecomp.resource.nfv.VDU.RoutingCategoryVDU + description: Definition of VCE Brocade VDU + properties: + vnf_category: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + vce_type: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + vendor: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + version: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + image_id: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer -vCE image used to boot VM + flavor_id: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer - VM Size, SMALL, MEDIUM, LARGE + username: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer -login user Id of Router + password: + type: string + description: I Input provided at DESIGN TIME by Service Composer or Designer - password for login + domain_name: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer or (perhaps pre-defined for each Cloud Region) - login domain + time_zone: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer or (perhaps pre-defined for each Cloud Region) - time zone to set for vCE + login_session_timeout: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer or (perhaps pre-defined for each Cloud Region) - user login session timeout + ipag_vlan_bandwidth: + type: integer + description: Input provided at DESIGN TIME by Service Composer or Designer - bandwidth allocation of customer VLAN requested by customer + vpe_vlan_interface_qos_name: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer - QoS Policy name to be applied to this interface + ipag_vlan_interface_qos_name: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer - QoS Policy name to be applied to this interface + hostname: + type: string + description: Input provided at RUN TIME by Cloud-PO - Host VM is created first and this value is input when the vCE image is later on installed by Cloud-PO + host_ip: + type: string + description: Input provided at RUN TIME by Cloud-PO - Host VM IP + availability_zone: + type: string + description: Input provided at RUN TIME by Cloud-PO - Cloud availability zone where VM is created + oam_loopback_vlan_ip_address: + type: string + description: Input provided at RUN TIME by Cloud-PO - OAM Network is pre-created - already exists in Data Center + ipag_vlan_ip_address: + type: string + description: Input provided at RUN TIME by Cloud-PO - IPAG VLAN Network is created by Cloud-PO before the vCE is created or installed + vpe_vlan_ip_address: + type: string + description: Input provided at RUN TIME by Cloud-PO - VPE VLAN Network is created by Cloud-PO before the vCE is created / installed + vpe_vlan_id: + type: string + description: Input provided at RUN TIME by Cloud-PO - VLAN Id is created first by Cloud-PO. It is required to apply VPE QoS Policy + ipag_vlan_id: + type: string + description: Input provided at RUN TIME by Cloud-PO - VLAN Id is created first by Cloud-PO. It is required to apply IPAG QoS Policy + oam_vlan_interface_name: + type: string + description: Input provided at RUN TIME by Cloud-PO - This interfce is created first by Cloud-PO. This is the interface to which QoS policy is applied + vpe_vlan_interface_name: + type: string + description: Input provided at RUN TIME by Cloud-PO - This interfce is created first by Cloud-PO. This is the interface to which QoS policy is applied + ipag_vlan_interface_name: + type: string + description: Input provided at RUN TIME by Cloud-PO - This interfce is created first by Cloud-PO. This is the interface to which QoS policy is applied + #############ATTRIBUTES of vCE - These values are outputted by Cloud-PO when vCE is created / installed ############## + attributes: + vce_name: + type: string + description: Name assigned to vCE by Cloud-PO + oam_loopback_vlan_ipaddres: + type: string + description: IP Address assigned by Cloud-PO to OAM VLAN + ipag_vlan_ipaddres: + type: string + description: IP Address assigned by Cloud-PO to IPAG VLAN + vpe_vlan_ipaddres: + type: string + description: IP Address assigned by Cloud-PO to VPE VLAN + vnf_id: + type: string + description: unique id assigned to VNF by Cloud-PO - used for AAI metadata + + #############CAPABILITIES of vCE - ######################### + capabilities: + ce_routing_capability: + type: org.openecomp.capabilities.nfv.CERouting + description: This is the base capability of vCE + occurrences: [1, UNBOUNDED] # default + + static_routing: + type: org.openecomp.capabilities.nfv.StaticRouting + description: This is the optional capability of the vCE + occurrences: [0, UNBOUNDED] + + bgp_routing: + type: org.openecomp.capabilities.nfv.BGPRouting + description: This is the optional capability of the vCE + occurrences: [0, UNBOUNDED] + + virtual_bindable: + type: org.openecomp.capabilities.nfv.VDU.VirtualBindable# paharoni - changed to org.openecomp.capabilities.nfv.vdu.VirtualBindable from tosca.capabilities.nfv.VDU.VirtualBindable - was it intentional?? + description: This is the internal capability of the VDU to support Binding to Connection Points + occurrences: [1, UNBOUNDED] + + dummy_capability: + type: org.openecomp.capabilities.nfv.VCE_Brocade_Routing + description: This capability has been introduced to model VCE VDU as a component of VCE VNF, because Node Template is not supported by ASDC Team + + #############REQUIREMENTS of vCE - ########################### + requirements: + - nat: # A vCE may have a requirement to connect to a VNF offering this capability, during service composition + capability: org.openecomp.capabilities.nfv.VNF.NetworkAddressTranslationCapability + node: org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU + relationship: org.openecomp.relationships.nfv.CnnectsToNAT + occurrences: [0, 1] + + - pat: # A vCE may have a requirement to connect to a VNF offering this capability, during service composition + capability: org.openecomp.capabilities.nfv.VNF.PortAddressTranslationCapability + node: org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU #paharoni - renamed from org.openecomp.resource.nfv.VDU.PortAddressTranslationCategoryVDU. Resource name can be up to 50 chars + relationship: org.openecomp.relationships.nfv.CnnectsToPAT + occurrences: [0, 1] + + + - firewall: # A vCE may have a requirement to connect to a VNF offering this capability, during service composition + capability: org.openecomp.capabilities.nfv.VNF.FirewallCapability + node: org.openecomp.resource.nfv.VDU.FirewallCategoryVDU + relationship: org.openecomp.relationships.nfv.CnnectsToFirewall + occurrences: [0, 1] + + - dhcp: # A vCE may have a requirement to connect to a VNF offering this capability, during service composition + capability: org.openecomp.capabilities.nfv.VNF.DHCPCapability + node: org.openecomp.resource.nfv.VDU.DHCPCategoryVDU + relationship: org.openecomp.relationships.nfv.CnnectsToDHCP + occurrences: [0, 1] + + - dns: # A vCE may have a requirement to connect to a VNF offering this capability, during service composition + capability: org.openecomp.capabilities.nfv.VNF.DNSCapability + node: org.openecomp.resource.nfv.VDU.DNSCategoryVDU + relationship: org.openecomp.relationships.nfv.CnnectsToDNS + occurrences: [0, 1] + + - hosted_on: # A vCE needs to be hosted in a VM + capability: tosca.capabilities.Container + node: tosca.nodes.Compute + relationship: tosca.relationships.HostedOn + occurrences: [1, 1] #default + + + + +######################################################################################################## +###################### 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] + +################################################################## +###################### 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 + +################################################################## +###################### 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 + +################################################################## +###################### 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 + +################################################################## +###################### DHCP VDU Node TYPE ############### +################################################################## + org.openecomp.resource.nfv.VDU.DHCPCategoryVDU: + derived_from: org.openecomp.resource.nfv.VDU + capabilities: #paharoni - 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 + +################################################################## +###################### 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 + + +########################################################################################### +###################### CAPABILITY TYPE DEFINITIONS ###################################### +########################################################################################### + +capability_types: + ##################################################################################### + ###################### TOSCA Capability: VirtualBindable ########################## + ##################################################################################### + tosca.capabilities.nfv.VDU.VirtualBindable: + derived_from: tosca.capabilities.Root + valid_source_types: [tosca.nodes.nfv.VDU] + + ##################################################################################### + ############################ ASDC Capability: VirtualBindable ##################### + ##################################################################################### + org.openecomp.capabilities.nfv.VDU.VirtualBindable: + derived_from: tosca.capabilities.nfv.VDU.VirtualBindable + valid_source_types: [org.openecomp.resource.nfv.VDU] + + ##################################################################################### + ##################### TOSCA Capability: VirtualLinkable ########################## + ##################################################################################### + tosca.capabilities.nfv.VirtualLinkable: + derived_from: tosca.capabilities.Root ##paharoni - changed from tosca.capabilities.nfv.VirtualLinkable - cannot derive from itself + valid_source_types: [org.openecomp.resource.nfv.VL] + + ##################################################################################### + ############################ ASDC Capability: VirtualLinkable ##################### + ##################################################################################### + org.openecomp.capabilities.nfv.VirtualLinkable: + derived_from: tosca.capabilities.Root + valid_source_types: [tosca.nodes.nfv.VL] + + ##################################################################################### + ############################ Capability: HighAvailability ########################## + ##################################################################################### + tosca.capabilities.nfv.HA: + derived_from: tosca.capabilities.Root + valid_source_types: [tosca.nodes.nfv.VDU] + + ##################################################################################### + ######################Capability: Generic asdc capability ########################## + ##################################################################################### + org.openecomp.capabilities.Root: + derived_from: tosca.capabilities.Root + + ##################################################################################### + ############################ Capability: GENERIC ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.RoutingCapability: + derived_from: org.openecomp.capabilities.Root + properties: + routing_type: + type: string + description: some basic routing descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.VDU.RoutingCategoryVDU] + + ##################################################################################### + ############################ Capability: CE ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.CERouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: PE ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.PERouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: P ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.PRouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: BGP ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.BGPRouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: STATIC ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.StaticRouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: Network Address Translation ############### + ##################################################################################### + org.openecomp.capabilities.nfv.VNF.NetworkAddressTranslationCapability: + derived_from: org.openecomp.capabilities.Root + properties: + nat_type: + type: string + description: some basic NAT descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU] + + ##################################################################################### + ############################ Capability: Port Address Translation ############### + ##################################################################################### + org.openecomp.capabilities.nfv.VNF.PortAddressTranslationCapability: + derived_from: org.openecomp.capabilities.Root + properties: + pat_type: + type: string + description: some basic PAT descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU] + + ##################################################################################### + ############################ Capability: FIREWALL ############### + ##################################################################################### + org.openecomp.capabilities.nfv.VNF.FirewallCapability: + derived_from: org.openecomp.capabilities.Root + properties: + firewall_type: + type: string + description: some basic Firewall Capability descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.VDU.FirewallCategoryVDU] + + ##################################################################################### + ############################ Capability: DHCP ############### + ##################################################################################### + org.openecomp.capabilities.nfv.VNF.DHCPCapability: + derived_from: org.openecomp.capabilities.Root + properties: + dhcp_type: + type: string + description: some basic DHCP Capability descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.VDU.DHCPCategoryVDU] + + ##################################################################################### + ############################ Capability: DNS ############### + ##################################################################################### + org.openecomp.capabilities.nfv.VNF.DNSCapability: + derived_from: org.openecomp.capabilities.Root + properties: + dns_type: + type: string + description: some basic DNS Capability descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.VDU.DNSCategoryVDU] + + ##################################################################################### + ############################ Capability: vCE Brocade ROUTING ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC BROCADE VDU ########### + ##################################################################################### + org.openecomp.capabilities.nfv.vCE_Brocade_Routing: + derived_from: org.openecomp.capabilities.nfv.CERouting + valid_source_types: [org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU] + + ##################################################################################### + ############################ Capability: OAM VLAn Connector ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC Connector ########### + ##################################################################################### + org.openecomp.capabilities.nfv.OAM_VLAN_Connector: + derived_from: org.openecomp.capabilities.Root + valid_source_types: [org.openecomp.resource.nfv.CP.OAM_VLAN_Connector] + + ##################################################################################### + ############################ Capability: IPAG VLAn Connector ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC Connector ########### + ##################################################################################### + org.openecomp.capabilities.nfv.IPAG_VLAN_Connector: + derived_from: org.openecomp.capabilities.Root + valid_source_types: [org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector] + + ##################################################################################### + ############################ Capability: VPE VLAn Connector ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC Connector ########### + ##################################################################################### + org.openecomp.capabilities.nfv.VPE_VLAN_Connector: + derived_from: org.openecomp.capabilities.Root + valid_source_types: [org.openecomp.resource.nfv.CP.VPE_VLAN_Connector] + +########################################################################################### +###################### RELATIONSHIP TYPE DEFINITIONS ################################### +########################################################################################### + +relationship_types: +##################################################################################### +######################TOSCA Relationship: VirtualBindsTo ########################## +##################################################################################### + tosca.relationships.nfv.VirtualBindsTo: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between VDU and CP Node Types + valid_target_types: [tosca.capabilities.nfv.VDU.VirtualBindable] + +##################################################################################### +######################ASDC Relationship: VirtualBindsTo ########################## +##################################################################################### + org.openecomp.relationships.nfv.VirtualBindsTo: + derived_from: tosca.relationships.nfv.VirtualBindsTo + description: Represents the relationsHIP between VDU and CP Node Types + valid_target_types: [org.openecomp.capabilities.nfv.VDU.VirtualBindable] + +##################################################################################### +##################### TOSCA Relationship: VirtualLinksTo ########################## +##################################################################################### + tosca.relationships.nfv.VirtualLinksTo: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between CP and VL Node Types + valid_target_types: [tosca.capabilities.nfv.VirtualLinkable] + +##################################################################################### +##################### ASDC Relationship: VirtualLinksTo ########################## +##################################################################################### + org.openecomp.relationships.nfv.VirtualLinksTo: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between CP and VL Node Types + valid_target_types: [org.openecomp.capabilities.nfv.VirtualLinkable] + +##################################################################################### +###################### ASDC Relationship: ConnectsToNAT ########################## +##################################################################################### + org.openecomp.relationships.nfv.CnnectsToNAT: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between a VNF and NAT capable Node + #properties: + #attributes: + #interfaces: + valid_target_types: [org.openecomp.capabilities.nfv.VNF.NetworkAddressTranslationCapability] + +##################################################################################### +###################### ASDC Relationship: ConnectsToPAT ########################## +##################################################################################### + org.openecomp.relationships.nfv.CnnectsToPAT: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between a VNF and PAT capable Node + #properties: + #attributes: + #interfaces: + valid_target_types: [org.openecomp.capabilities.nfv.VNF.PortAddressTranslationCapability] + +##################################################################################### +###################### ASDC Relationship: ConnectsToFirewall ########################## +##################################################################################### + org.openecomp.relationships.nfv.CnnectsToFirewall: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between a VNF and Firewall capable Node + #properties: + #attributes: + #interfaces: + valid_target_types: [org.openecomp.capabilities.nfv.VNF.FirewallCapability] + +##################################################################################### +###################### ASDC Relationship: ConnectsToDNS ########################## +##################################################################################### + org.openecomp.relationships.nfv.CnnectsToDNS: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between a VNF and DNS capable Node + #properties: + #attributes: + #interfaces: + valid_target_types: [org.openecomp.capabilities.nfv.VNF.DNSCapability] + +##################################################################################### +###################### ASDC Relationship: ConnectsToDHCP ########################## +##################################################################################### + org.openecomp.relationships.nfv.CnnectsToDHCP: + derived_from: tosca.relationships.ConnectsTo + description: Represents the relationsHIP between a VNF and DHCP capable Node + #properties: + #attributes: + #interfaces: + valid_target_types: [org.openecomp.capabilities.nfv.VNF.DHCPCapability] +
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/capabilityTypes.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/capabilityTypes.zip Binary files differnew file mode 100644 index 0000000000..75f56d4c76 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/capabilityTypes.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/importVceBrocade.sh b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/importVceBrocade.sh new file mode 100644 index 0000000000..76f567bfe2 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/importVceBrocade.sh @@ -0,0 +1,89 @@ +#!/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 "tosca.nodes.nfv.CP" +addResource "tosca.nodes.nfv.VDU" + +addResource "org.openecomp.resource.nfv.CP" +addResource "org.openecomp.resource.nfv.VDU" + +addResource "org.openecomp.resource.nfv.vdu.RoutingCategoryVDU" +addResource "org.openecomp.resource.nfv.vdu.VCE_Brocade_VDU" +addResource "org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector" +addResource "org.openecomp.resource.nfv.cp.OAM_VLAN_Connector" +addResource "org.openecomp.resource.nfv.cp.VPE_VLAN_Connector" + +#addResource "tosca.nodes.nfv.VL" +#addResource "tosca.nodes.nfv.VNF" +#addResource "org.openecomp.resource.nfv.VL" +#addResource "org.openecomp.resource.nfv.VNF" +#addResource "org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU" +#addResource "org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF" +#addResource "org.openecomp.resource.nfv.VDU.DHCPCategoryVDU" +#addResource "org.openecomp.resource.nfv.VDU.DNSCategoryVDU" +#addResource "org.openecomp.resource.nfv.VDU.FirewallCategoryVDU" +#addResource "org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU" + + +exit 0 diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.json new file mode 100644 index 0000000000..390fda0257 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector", + "description": "Represents a virtual or physical interface between the NFV and the LAN.", + "resourceIconPath": "port", + "category": "Network Layer 2-3/LAN Connectors", + "tags": [ + "org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector", "LAN Connector" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.yaml new file mode 100644 index 0000000000..03ecc8ea3e --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.yaml @@ -0,0 +1,48 @@ +################################################################## + ############### IPAG VLAN Connector CP Node ##################### + ################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector: + derived_from: org.openecomp.resource.nfv.CP + properties: + ipag_network_name: + type: string + + ipag_network_type: + type: string + + ipag_network_uuid: + type: string + + vlan_segment_ids: + type: list + entry_schema: + type: string + description: list of segmentation Ids. + + + #attributes: + capabilities: + dummy_capability: + type: org.openecomp.capabilities.nfv.IPAG_VLAN_Connector + description: This capability has been introduced to model this Connector as a component of VCE VNF, because Node Template is not supported by ASDC Team + + requirements: + - virtualBindingRequirement: + capability: org.openecomp.capabilities.nfv.vdu.VirtualBindable + #node: org.openecomp.asdc.nodes.vCE_Brocade_VDU + relationship: org.openecomp.relationships.nfv.VirtualBindsTo + occurrences: [1, 1] #default + + - virtualLinkingrequirement: + capability: org.openecomp.capabilities.nfv.VirtualLinkable + #node: org.openecomp.asdc.nodes.nfv.VL + relationship: org.openecomp.relationships.nfv.VirtualLinksTo + occurrences: [1, 1] #default + + #interfaces: + #standard: + #configure: + #implementation: configure.sh +
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.zip Binary files differnew file mode 100644 index 0000000000..31ddc8cbf6 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector/org.openecomp.resource.nfv.CP.IPAG_VLAN_Connector.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.json new file mode 100644 index 0000000000..b4f9a8f03e --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.cp.OAM_VLAN_Connector.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.cp.OAM_VLAN_Connector", + "description": "Represents a virtual or physical interface between the NFV and the OAM.", + "resourceIconPath": "port", + "category": "Network Layer 2-3/LAN Connectors", + "tags": [ + "org.openecomp.resource.nfv.cp.OAM_VLAN_Connector", "OAM Connector", "OAM" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.yaml new file mode 100644 index 0000000000..6f7c86f676 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.yaml @@ -0,0 +1,48 @@ +################################################################## + ############### OAM VLAN Connector CP Node ##################### + ################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.cp.OAM_VLAN_Connector: + derived_from: org.openecomp.resource.nfv.CP + properties: + oam_network_name: + type: string + + oam_network_type: + type: string + + oam_network_uuid: + type: string + + vlan_segment_ids: + type: list + entry_schema: + type: string + description: list of segmentation Ids. + + + #attributes: + capabilities: + dummy_capability: + type: org.openecomp.capabilities.nfv.OAM_VLAN_Connector + description: This capability has been introduced to model this Connector as a component of VCE VNF, because Node Template is not supported by ASDC Team + + requirements: + - virtualBindingRequirement: + capability: org.openecomp.capabilities.nfv.vdu.VirtualBindable + #node: org.openecomp.asdc.nodes.vCE_Brocade_VDU + relationship: org.openecomp.relationships.nfv.VirtualBindsTo + occurrences: [1, 1] #default + + - virtualLinkingrequirement: + capability: org.openecomp.capabilities.nfv.VirtualLinkable + #node: org.openecomp.asdc.nodes.nfv.VL + relationship: org.openecomp.relationships.nfv.VirtualLinksTo + occurrences: [1, 1] #default + + #interfaces: + #standard: + #configure: + #implementation: configure.sh +
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.zip Binary files differnew file mode 100644 index 0000000000..2076fb039b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector/org.openecomp.resource.nfv.CP.OAM_VLAN_Connector.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.json new file mode 100644 index 0000000000..819335d0f3 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.cp.VPE_VLAN_Connector.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.cp.VPE_VLAN_Connector", + "description": "Represents a virtual or physical interface between the NFV and the WAN.", + "resourceIconPath": "port", + "category": "Network Layer 2-3/WAN Connectors", + "tags": [ + "org.openecomp.resource.nfv.cp.VPE_VLAN_Connector", "WAN Connector" + ] +} diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.yaml new file mode 100644 index 0000000000..f5f7380374 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.yaml @@ -0,0 +1,48 @@ +################################################################## + ############### VPE VLAN Connector CP Node ##################### + ################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.cp.VPE_VLAN_Connector: + derived_from: org.openecomp.resource.nfv.CP + properties: + vpe_network_name: + type: string + + vpe_network_type: + type: string + + vpe_network_uuid: + type: string + + vlan_segment_ids: + type: list + entry_schema: + type: string + description: list of segmentation Ids. + + + #attributes: + capabilities: + dummy_capability: + type: org.openecomp.capabilities.nfv.VPE_VLAN_Connector + description: This capability has been introduced to model this Connector as a component of VCE VNF, because Node Template is not supported by ASDC Team + + requirements: + - virtualBindingRequirement: + capability: org.openecomp.capabilities.nfv.vdu.VirtualBindable + #node: org.openecomp.asdc.nodes.vCE_Brocade_VDU + relationship: org.openecomp.relationships.nfv.VirtualBindsTo + occurrences: [1, 1] #default + + - virtualLinkingrequirement: + capability: org.openecomp.capabilities.nfv.VirtualLinkable + #node: org.openecomp.asdc.nodes.nfv.VL + relationship: org.openecomp.relationships.nfv.VirtualLinksTo + occurrences: [1, 1] #default + + #interfaces: + #standard: + #configure: + #implementation: configure.sh +
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.zip Binary files differnew file mode 100644 index 0000000000..5808fc9338 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector/org.openecomp.resource.nfv.CP.VPE_VLAN_Connector.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.json new file mode 100644 index 0000000000..76c3eabc26 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.CP.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.CP", + "description": "ATT CP element", + "resourceIconPath": "defaulticon", + "category": "Generic/Abstract", + "tags": [ + "org.openecomp.resource.nfv.CP" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.yaml new file mode 100644 index 0000000000..ba6bda0c8b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.yaml @@ -0,0 +1,7 @@ +################################################################## +############################ ASDC CP Node ##################### +################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.CP: + derived_from: tosca.nodes.nfv.CP
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.zip Binary files differnew file mode 100644 index 0000000000..0fd24994f9 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.CP/org.openecomp.resource.nfv.CP.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.json new file mode 100644 index 0000000000..95673b81ff --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.vdu.RoutingCategoryVDU.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.vdu.RoutingCategoryVDU", + "description": "Node Type that represents a Module", + "resourceIconPath": "defaulticon", + "category": "Generic/Infrastructure", + "tags": [ + "org.openecomp.resource.nfv.vdu.RoutingCategoryVDU" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.yaml new file mode 100644 index 0000000000..5bbc64cb2c --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.yaml @@ -0,0 +1,7 @@ +################################################################## +###################### ASDC Routing Category VDU ################# +################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.vdu.RoutingCategoryVDU: + derived_from: org.openecomp.resource.nfv.VDU diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.zip Binary files differnew file mode 100644 index 0000000000..3853a341b0 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU/org.openecomp.resource.nfv.VDU.RoutingCategoryVDU.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.json new file mode 100644 index 0000000000..91b692357b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.vdu.VCE_Brocade_VDU.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.vdu.VCE_Brocade_VDU", + "description": "Brocade Vyatta 5600 vRouter used as Virtual Customer Edge (vCE) delivers high throughput on general-purpose x86 server. it is based on open standards, open protocols and is fully compatible with legacy networks. It has advanced functionality to be able to deploy in a variety of network environments.", + "resourceIconPath": "brocade", + "category": "Network Layer 2-3/Router", + "tags": [ + "org.openecomp.resource.nfv.vdu.VCE_Brocade_VDU", "vCE", "Brocade", "Gamma" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.yaml new file mode 100644 index 0000000000..2ba732ab3b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.yaml @@ -0,0 +1,156 @@ +################################################################## +###################### vCE_Brocade_VDU Node TYPE ############### +################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.vdu.VCE_Brocade_VDU: + derived_from: org.openecomp.resource.nfv.vdu.RoutingCategoryVDU + description: Definition of VCE Brocade VDU + properties: + vnf_category: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + vce_type: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + vendor: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + version: + type: string + description: input provided at RESOURCE INJECTION TIME in ASDC TOOL + image_id: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer -vCE image used to boot VM + flavor_id: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer - VM Size, SMALL, MEDIUM, LARGE + username: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer -login user Id of Router + password: + type: string + description: I Input provided at DESIGN TIME by Service Composer or Designer - password for login + domain_name: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer or (perhaps pre-defined for each Cloud Region) - login domain + time_zone: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer or (perhaps pre-defined for each Cloud Region) - time zone to set for vCE + login_session_timeout: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer or (perhaps pre-defined for each Cloud Region) - user login session timeout + ipag_vlan_bandwidth: + type: integer + description: Input provided at DESIGN TIME by Service Composer or Designer - bandwidth allocation of customer VLAN requested by customer + vpe_vlan_interface_qos_name: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer - QoS Policy name to be applied to this interface + ipag_vlan_interface_qos_name: + type: string + description: Input provided at DESIGN TIME by Service Composer or Designer - QoS Policy name to be applied to this interface + hostname: + type: string + description: Input provided at RUN TIME by Cloud-PO - Host VM is created first and this value is input when the vCE image is later on installed by Cloud-PO + host_ip: + type: string + description: Input provided at RUN TIME by Cloud-PO - Host VM IP + availability_zone: + type: string + description: Input provided at RUN TIME by Cloud-PO - Cloud availability zone where VM is created + oam_loopback_vlan_ip_address: + type: string + description: Input provided at RUN TIME by Cloud-PO - OAM Network is pre-created - already exists in Data Center + ipag_vlan_ip_address: + type: string + description: Input provided at RUN TIME by Cloud-PO - IPAG VLAN Network is created by Cloud-PO before the vCE is created or installed + vpe_vlan_ip_address: + type: string + description: Input provided at RUN TIME by Cloud-PO - VPE VLAN Network is created by Cloud-PO before the vCE is created / installed + vpe_vlan_id: + type: string + description: Input provided at RUN TIME by Cloud-PO - VLAN Id is created first by Cloud-PO. It is required to apply VPE QoS Policy + ipag_vlan_id: + type: string + description: Input provided at RUN TIME by Cloud-PO - VLAN Id is created first by Cloud-PO. It is required to apply IPAG QoS Policy + oam_vlan_interface_name: + type: string + description: Input provided at RUN TIME by Cloud-PO - This interfce is created first by Cloud-PO. This is the interface to which QoS policy is applied + vpe_vlan_interface_name: + type: string + description: Input provided at RUN TIME by Cloud-PO - This interfce is created first by Cloud-PO. This is the interface to which QoS policy is applied + ipag_vlan_interface_name: + type: string + description: Input provided at RUN TIME by Cloud-PO - This interfce is created first by Cloud-PO. This is the interface to which QoS policy is applied + #############ATTRIBUTES of vCE - These values are outputted by Cloud-PO when vCE is created / installed ############## + attributes: + vce_name: + type: string + description: Name assigned to vCE by Cloud-PO + oam_loopback_vlan_ipaddres: + type: string + description: IP Address assigned by Cloud-PO to OAM VLAN + ipag_vlan_ipaddres: + type: string + description: IP Address assigned by Cloud-PO to IPAG VLAN + vpe_vlan_ipaddres: + type: string + description: IP Address assigned by Cloud-PO to VPE VLAN + vnf_id: + type: string + description: unique id assigned to VNF by Cloud-PO - used for AAI metadata + + #############CAPABILITIES of vCE - ######################### + capabilities: + ce_routing_capability: + type: org.openecomp.capabilities.nfv.CERouting + description: This is the base capability of vCE + occurrences: [1, UNBOUNDED] # default + + static_routing: + type: org.openecomp.capabilities.nfv.StaticRouting + description: This is the optional capability of the vCE + occurrences: [0, UNBOUNDED] + + bgp_routing: + type: org.openecomp.capabilities.nfv.BGPRouting + description: This is the optional capability of the vCE + occurrences: [0, UNBOUNDED] + + virtual_bindable: + type: org.openecomp.capabilities.nfv.vdu.VirtualBindable + description: This is the internal capability of the VDU to support Binding to Connection Points + occurrences: [1, UNBOUNDED] + + dummy_capability: + type: org.openecomp.capabilities.nfv.VCE_Brocade_Routing + description: This capability has been introduced to model VCE VDU as a component of VCE VNF, because Node Template is not supported by ASDC Team + + #############REQUIREMENTS of vdu - ########################### + requirements: + - oam_vlan_connector: + capability: org.openecomp.capabilities.nfv.OAM_VLAN_Connector + node: org.openecomp.resource.nfv.cp.OAM_VLAN_Connector + relationship: tosca.relationships.ConnectsTo + occurrences: [1, 1] + + - vpe_vlan_connector: + capability: org.openecomp.capabilities.nfv.VPE_VLAN_Connector + node: org.openecomp.resource.nfv.cp.VPE_VLAN_Connector + relationship: tosca.relationships.ConnectsTo + occurrences: [1, 1] + + - ipag_vlan_connector: + capability: org.openecomp.capabilities.nfv.IPAG_VLAN_Connector + node: org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector + relationship: tosca.relationships.ConnectsTo + occurrences: [1, 1] + + - hosted_on: # A vCE needs to be hosted in a VM + capability: tosca.capabilities.Container + node: tosca.nodes.Compute + relationship: tosca.relationships.HostedOn + occurrences: [1, 1] #default + + + diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.zip Binary files differnew file mode 100644 index 0000000000..1d5b041a88 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU/org.openecomp.resource.nfv.VDU.VCE_Brocade_VDU.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.json new file mode 100644 index 0000000000..9623090743 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.VDU.yaml", + "contactId": "jh0003", + "name": "org.openecomp.resource.nfv.VDU", + "description": "Node Type that represents a Module", + "resourceIconPath": "defaulticon", + "category": "Generic/Abstract", + "tags": [ + "org.openecomp.resource.nfv.VDU" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.yaml new file mode 100644 index 0000000000..f5e5aa9195 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.yaml @@ -0,0 +1,5 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.nfv.VDU: + derived_from: tosca.nodes.nfv.VDU + description: A VDU is a compute component of VNF
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.zip Binary files differnew file mode 100644 index 0000000000..569a8b2a44 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/org.openecomp.resource.nfv.VDU/org.openecomp.resource.nfv.VDU.zip 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 new file mode 100644 index 0000000000..e17b474385 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.yaml", + "contactId": "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 new file mode 100644 index 0000000000..64f150e73e --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.yaml @@ -0,0 +1,10 @@ +################################################################## +###################### DHCP VDU Node TYPE ############### +################################################################## + org.openecomp.resource.nfv.VDU.DHCPCategoryVDU: + derived_from: org.openecomp.resource.nfv.VDU + capabilities: #paharoni - 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 differnew file mode 100644 index 0000000000..d60b15698c --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU/org.openecomp.resource.nfv.VDU.DHCPCategoryVDU.zip 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 new file mode 100644 index 0000000000..8c419d17d3 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.VDU.DNSCategoryVDU.yaml", + "contactId": "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 new file mode 100644 index 0000000000..58aa9f3e81 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.yaml @@ -0,0 +1,10 @@ +################################################################## +###################### 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 differnew file mode 100644 index 0000000000..e927ad3d2a --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.DNSCategoryVDU/org.openecomp.resource.nfv.VDU.DNSCategoryVDU.zip 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 new file mode 100644 index 0000000000..6c0b033552 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.json @@ -0,0 +1,11 @@ +{ + "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 new file mode 100644 index 0000000000..f22dfcb35e --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.yaml @@ -0,0 +1,10 @@ +################################################################## +###################### 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 differnew file mode 100644 index 0000000000..548b64ed17 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU/org.openecomp.resource.nfv.VDU.FirewallCategoryVDU.zip 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 new file mode 100644 index 0000000000..be8f6fd133 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.yaml", + "contactId": "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 new file mode 100644 index 0000000000..133ccc33b5 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.yaml @@ -0,0 +1,10 @@ +################################################################## +###################### 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 differnew file mode 100644 index 0000000000..93ef2905f6 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU/org.openecomp.resource.nfv.VDU.NetworkAddrCategoryVDU.zip 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 new file mode 100644 index 0000000000..26a2dd9a08 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.json @@ -0,0 +1,11 @@ +{ + "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 new file mode 100644 index 0000000000..04aad2f848 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.yaml @@ -0,0 +1,10 @@ +################################################################## +###################### 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 differnew file mode 100644 index 0000000000..0bad67331b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU/org.openecomp.resource.nfv.VDU.PortAddrCategoryVDU.zip 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 new file mode 100644 index 0000000000..7ea24e09f5 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.json @@ -0,0 +1,11 @@ +{ + "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 new file mode 100644 index 0000000000..0709072040 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.yaml @@ -0,0 +1,7 @@ +################################################################## +###################### 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 differnew file mode 100644 index 0000000000..b6d19de95b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VL/org.openecomp.resource.nfv.VL.zip 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 new file mode 100644 index 0000000000..6e68301bcb --- /dev/null +++ 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 @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.VNF.VCE_Brocade_VNF.yaml", + "contactId": "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 new file mode 100644 index 0000000000..bbd0fe0945 --- /dev/null +++ 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 @@ -0,0 +1,32 @@ +######################################################################################################## +###################### 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 differnew file mode 100644 index 0000000000..158f917ee8 --- /dev/null +++ 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 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 new file mode 100644 index 0000000000..18ce8bbca5 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.json @@ -0,0 +1,11 @@ +{ + "payloadName": "org.openecomp.resource.nfv.VNF.yaml", + "contactId": "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 new file mode 100644 index 0000000000..6872cfc7fb --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.yaml @@ -0,0 +1,5 @@ +################################################################## +###################### 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 differnew file mode 100644 index 0000000000..2b8e33d71a --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/org.openecomp.resource.nfv.VNF/org.openecomp.resource.nfv.VNF.zip 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 new file mode 100644 index 0000000000..e5bcfb204e --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.json @@ -0,0 +1,11 @@ +{ + "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 new file mode 100644 index 0000000000..2fbcc9c46d --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.yaml @@ -0,0 +1,16 @@ +################################################################## + ############## 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 differnew file mode 100644 index 0000000000..fc7ba8d27b --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VL/tosca.nodes.nfv.VL.zip 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 new file mode 100644 index 0000000000..bd6047734c --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.json @@ -0,0 +1,11 @@ +{ + "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 new file mode 100644 index 0000000000..5cf9453884 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.yaml @@ -0,0 +1,30 @@ +################################################################## +################### 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 differnew file mode 100644 index 0000000000..3c10c5f388 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/resourcesToFix/tosca.nodes.nfv.VNF/tosca.nodes.nfv.VNF.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.json new file mode 100644 index 0000000000..bf82a9a390 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.json @@ -0,0 +1,11 @@ +{ + "payloadName": "tosca.nodes.nfv.CP.yaml", + "contactId": "jh0003", + "name": "tosca.nodes.nfv.CP", + "description": "TOSCA CP base element", + "resourceIconPath": "defaulticon", + "category": "Generic/Abstract", + "tags": [ + "tosca.nodes.nfv.CP" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.yaml new file mode 100644 index 0000000000..271a4bf026 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.yaml @@ -0,0 +1,24 @@ + ################################################################## + ####################### TOSCA CP Node ########################## + ################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.CP: + derived_from: tosca.nodes.Root + properties: + type: + type: string + required: false + requirements: + - virtualbinding: + capability: tosca.capabilities.nfv.vdu.VirtualBindable + occurrences: [1, 1] #this is default + + - virtuallink: + capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: [1, 1] #this is default + + attributes: + ip_address: + type: string + # required: false
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.zip Binary files differnew file mode 100644 index 0000000000..2d7281a915 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.CP/tosca.nodes.nfv.CP.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.json b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.json new file mode 100644 index 0000000000..2ab0340e59 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.json @@ -0,0 +1,11 @@ +{ + "payloadName": "tosca.nodes.nfv.VDU.yaml", + "contactId": "jh0003", + "name": "tosca.nodes.nfv.VDU", + "description": "TOSCA VDU base element", + "resourceIconPath": "defaulticon", + "category": "Generic/Abstract", + "tags": [ + "tosca.nodes.nfv.VDU" + ] +}
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.yaml new file mode 100644 index 0000000000..d1cba804e6 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.yaml @@ -0,0 +1,28 @@ + ################################################################## + ###################### TOSCA VDU Node ########################## + ################################################################## +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VDU: + derived_from: tosca.nodes.SoftwareComponent + #properties: + + capabilities: + high_availability: + type: tosca.capabilities.nfv.HA + occurrences: [1, UNBOUNDED] # this is default + + virtual_binding: + type: tosca.capabilities.nfv.vdu.VirtualBindable + occurrences: [1, UNBOUNDED] # this is default + + requirements: + - high_availability: + capability: tosca.capabilities.nfv.HA + occurrences: [0,1] + + - host: ##Is hosted in a VM + capability: tosca.capabilities.Container + node: tosca.nodes.Compute + relationship: tosca.relationships.HostedOn + occurrences: [1, 1] #this is default
\ No newline at end of file diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.zip b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.zip Binary files differnew file mode 100644 index 0000000000..3ba4eb7d80 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/tosca.nodes.nfv.VDU/tosca.nodes.nfv.VDU.zip diff --git a/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/vce.brocade.capabilities.yaml b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/vce.brocade.capabilities.yaml new file mode 100644 index 0000000000..af55754cf3 --- /dev/null +++ b/asdc-tests/src/test/resources/CI/importResource-VCE-Brocade/vce.brocade.capabilities.yaml @@ -0,0 +1,191 @@ +##################################################################################### + ###################### TOSCA Capability: VirtualBindable ########################## + ##################################################################################### + tosca.capabilities.nfv.vdu.VirtualBindable: + derived_from: tosca.capabilities.Root + valid_source_types: [tosca.nodes.nfv.VDU] + + ##################################################################################### + ##################### TOSCA Capability: VirtualLinkable ########################## + ##################################################################################### + tosca.capabilities.nfv.VirtualLinkable: + derived_from: tosca.capabilities.Root ##paharoni - changed from tosca.capabilities.nfv.VirtualLinkable - cannot derive from itself + valid_source_types: [org.openecomp.resource.nfv.VL] + + ##################################################################################### + ############################ Capability: HighAvailability ########################## + ##################################################################################### + tosca.capabilities.nfv.HA: + derived_from: tosca.capabilities.Root + valid_source_types: [tosca.nodes.nfv.VDU] + + ##################################################################################### + ############################ ASDC Capability: VirtualBindable ##################### + ##################################################################################### + org.openecomp.capabilities.nfv.vdu.VirtualBindable: + derived_from: tosca.capabilities.nfv.vdu.VirtualBindable + valid_source_types: [org.openecomp.resource.nfv.VDU] + + + + ##################################################################################### + ############################ ASDC Capability: VirtualLinkable ##################### + ##################################################################################### + org.openecomp.capabilities.nfv.VirtualLinkable: + derived_from: tosca.capabilities.Root + valid_source_types: [tosca.nodes.nfv.VL] + + + + ##################################################################################### + ######################Capability: Generic asdc capability ########################## + ##################################################################################### + org.openecomp.capabilities.Root: + derived_from: tosca.capabilities.Root + + ##################################################################################### + ############################ Capability: GENERIC ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.RoutingCapability: + derived_from: org.openecomp.capabilities.Root + properties: + routing_type: + type: string + description: some basic routing descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.vdu.RoutingCategoryVDU] + + ##################################################################################### + ############################ Capability: CE ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.CERouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: PE ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.PERouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: P ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.PRouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: BGP ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.BGPRouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: STATIC ROUTING ########################## + ##################################################################################### + org.openecomp.capabilities.nfv.StaticRouting: + derived_from: org.openecomp.capabilities.nfv.RoutingCapability + + ##################################################################################### + ############################ Capability: Network Address Translation ############### + ##################################################################################### + org.openecomp.capabilities.nfv.vnf.NetworkAddressTranslationCapability: + derived_from: org.openecomp.capabilities.Root + properties: + nat_type: + type: string + description: some basic NAT descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.vdu.NetworkAddressTranslationCategoryVDU] + + ##################################################################################### + ############################ Capability: Port Address Translation ############### + ##################################################################################### + org.openecomp.capabilities.nfv.vnf.PortAddressTranslationCapability: + derived_from: org.openecomp.capabilities.Root + properties: + pat_type: + type: string + description: some basic PAT descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.vdu.PortAddressTranslationCategoryVDU] + + ##################################################################################### + ############################ Capability: FIREWALL ############### + ##################################################################################### + org.openecomp.capabilities.nfv.vnf.FirewallCapability: + derived_from: org.openecomp.capabilities.Root + properties: + firewall_type: + type: string + description: some basic Firewall Capability descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.vdu.FirewallCategoryVDU] + + ##################################################################################### + ############################ Capability: DHCP ############### + ##################################################################################### + org.openecomp.capabilities.nfv.vnf.DHCPCapability: + derived_from: org.openecomp.capabilities.Root + properties: + dhcp_type: + type: string + description: some basic DHCP Capability descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.vdu.DHCPCategoryVDU] + + ##################################################################################### + ############################ Capability: DNS ############### + ##################################################################################### + org.openecomp.capabilities.nfv.vnf.DNSCapability: + derived_from: org.openecomp.capabilities.Root + properties: + dns_type: + type: string + description: some basic DNS Capability descriptor, if any??? + constraints: + - valid_values: [TBD1, TBDn] + #attributes: ??? + valid_source_types: [org.openecomp.resource.nfv.vdu.DNSCategoryVDU] + + ##################################################################################### + ############################ Capability: vCE Brocade ROUTING ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC BROCADE VDU ########### + ##################################################################################### + org.openecomp.capabilities.nfv.VCE_Brocade_Routing: + derived_from: org.openecomp.capabilities.nfv.CERouting + valid_source_types: [org.openecomp.resource.nfv.vdu.VCE_Brocade_VDU] + + ##################################################################################### + ############################ Capability: OAM VLAn Connector ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC Connector ########### + ##################################################################################### + org.openecomp.capabilities.nfv.OAM_VLAN_Connector: + derived_from: org.openecomp.capabilities.Root + valid_source_types: [org.openecomp.resource.nfv.cp.OAM_VLAN_Connector] + + ##################################################################################### + ############################ Capability: IPAG VLAn Connector ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC Connector ########### + ##################################################################################### + org.openecomp.capabilities.nfv.IPAG_VLAN_Connector: + derived_from: org.openecomp.capabilities.Root + valid_source_types: [org.openecomp.resource.nfv.cp.IPAG_VLAN_Connector] + + ##################################################################################### + ############################ Capability: VPE VLAn Connector ################# DUMMY + ############## THIS IS CAPABILITY IS ONLY OFFERED BY SPECIFIC Connector ########### + ##################################################################################### + org.openecomp.capabilities.nfv.VPE_VLAN_Connector: + derived_from: org.openecomp.capabilities.Root + valid_source_types: [org.openecomp.resource.nfv.cp.VPE_VLAN_Connector] +
\ No newline at end of file |