From fefa3e408f77289594e47edc878d1bee61fca90b Mon Sep 17 00:00:00 2001 From: "Gitelman, Tal (tg851x)" Date: Tue, 20 Mar 2018 01:04:54 +0200 Subject: Normative alignemet Change-Id: I6115e20fe95662153903873d19439bc7cf0c2ff1 Issue-ID: SDC-1104 Signed-off-by: Gitelman, Tal (tg851x) --- .../genericNeutronNet/genericNeutronNet.json | 21 --- .../genericNeutronNet/genericNeutronNet.yml | 36 ----- .../genericNeutronNet/genericNeutronNet.zip | Bin 611 -> 0 bytes .../heat-types/overlayTunnel/overlayTunnel.json | 21 --- .../heat-types/overlayTunnel/overlayTunnel.yml | 142 ------------------ .../heat-types/overlayTunnel/overlayTunnel.zip | Bin 1081 -> 0 bytes .../tosca/heat-types/underlayVpn/underlayVpn.json | 21 --- .../tosca/heat-types/underlayVpn/underlayVpn.yml | 162 --------------------- .../tosca/heat-types/underlayVpn/underlayVpn.zip | Bin 1164 -> 0 bytes .../resources/import/tosca/nfv-types/NSD/NSD.json | 15 ++ .../resources/import/tosca/nfv-types/NSD/NSD.yml | 41 ++++++ .../resources/import/tosca/nfv-types/NSD/NSD.zip | Bin 0 -> 554 bytes .../resources/import/tosca/nfv-types/VDU/VDU.json | 15 ++ .../resources/import/tosca/nfv-types/VDU/VDU.yml | 22 +++ .../resources/import/tosca/nfv-types/VDU/VDU.zip | Bin 0 -> 457 bytes .../allottedResource/allottedResource.json | 20 +++ .../allottedResource/allottedResource.yml | 38 +++++ .../allottedResource/allottedResource.zip | Bin 0 -> 608 bytes .../tosca/nfv-types/extImageFile/extImageFile.json | 15 ++ .../tosca/nfv-types/extImageFile/extImageFile.yml | 25 ++++ .../tosca/nfv-types/extImageFile/extImageFile.zip | Bin 0 -> 377 bytes .../nfv-types/extLocalStorage/extLocalStorage.json | 15 ++ .../nfv-types/extLocalStorage/extLocalStorage.yml | 14 ++ .../nfv-types/extLocalStorage/extLocalStorage.zip | Bin 0 -> 350 bytes .../import/tosca/nfv-types/extZteCP/extZteCP.json | 15 ++ .../import/tosca/nfv-types/extZteCP/extZteCP.yml | 76 ++++++++++ .../import/tosca/nfv-types/extZteCP/extZteCP.zip | Bin 0 -> 586 bytes .../tosca/nfv-types/extZteVDU/extZteVDU.json | 15 ++ .../import/tosca/nfv-types/extZteVDU/extZteVDU.yml | 67 +++++++++ .../import/tosca/nfv-types/extZteVDU/extZteVDU.zip | Bin 0 -> 636 bytes .../import/tosca/nfv-types/extZteVL/extZteVL.json | 15 ++ .../import/tosca/nfv-types/extZteVL/extZteVL.yml | 69 +++++++++ .../import/tosca/nfv-types/extZteVL/extZteVL.zip | Bin 0 -> 529 bytes .../genericNeutronNet/genericNeutronNet.json | 21 +++ .../genericNeutronNet/genericNeutronNet.yml | 36 +++++ .../genericNeutronNet/genericNeutronNet.zip | Bin 0 -> 611 bytes .../nfv-types/overlayTunnel/overlayTunnel.json | 21 +++ .../nfv-types/overlayTunnel/overlayTunnel.yml | 142 ++++++++++++++++++ .../nfv-types/overlayTunnel/overlayTunnel.zip | Bin 0 -> 1081 bytes .../tosca/nfv-types/underlayVpn/underlayVpn.json | 21 +++ .../tosca/nfv-types/underlayVpn/underlayVpn.yml | 162 +++++++++++++++++++++ .../tosca/nfv-types/underlayVpn/underlayVpn.zip | Bin 0 -> 1164 bytes .../tosca/nfv-types/vduCompute/vduCompute.json | 15 ++ .../tosca/nfv-types/vduCompute/vduCompute.yml | 96 ++++++++++++ .../tosca/nfv-types/vduCompute/vduCompute.zip | Bin 0 -> 667 bytes .../import/tosca/nfv-types/vduCpd/vduCpd.json | 15 ++ .../import/tosca/nfv-types/vduCpd/vduCpd.yml | 57 ++++++++ .../import/tosca/nfv-types/vduCpd/vduCpd.zip | Bin 0 -> 554 bytes .../vduVirtualStorage/vduVirtualStorage.json | 15 ++ .../vduVirtualStorage/vduVirtualStorage.yml | 27 ++++ .../vduVirtualStorage/vduVirtualStorage.zip | Bin 0 -> 421 bytes .../vnfVirtualLinkDesc/vnfVirtualLinkDesc.json | 15 ++ .../vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml | 26 ++++ .../vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip | Bin 0 -> 478 bytes .../allottedResource/allottedResource.json | 20 --- .../allottedResource/allottedResource.yml | 38 ----- .../allottedResource/allottedResource.zip | Bin 608 -> 0 bytes .../scripts/import/tosca/importNfvTypes.py | 113 ++++++++++++++ .../scripts/import/tosca/importNormativeTypes.py | 2 +- .../scripts/import/tosca/importONAPNormativeAll.py | 16 +- .../scripts/import/tosca/importOnapTypes.py | 16 +- .../scripts/import/tosca/importSolTypes.py | 99 +++++++++++++ .../scripts/import/tosca/onapTypesToUpgrade.json | 4 + .../scripts/import/tosca/upgradeNfvTypes.py | 104 +++++++++++++ .../scripts/import/tosca/upgradeONAPNormative.py | 12 +- .../scripts/import/tosca/upgradeSolTypes.py | 104 +++++++++++++ 66 files changed, 1597 insertions(+), 480 deletions(-) delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.json delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml delete mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.json create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml create mode 100644 catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip delete mode 100644 catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json delete mode 100644 catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml delete mode 100644 catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip create mode 100644 catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py create mode 100644 catalog-be/src/main/resources/scripts/import/tosca/importSolTypes.py create mode 100644 catalog-be/src/main/resources/scripts/import/tosca/upgradeNfvTypes.py create mode 100644 catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py (limited to 'catalog-be') diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json deleted file mode 100644 index d9b008a870..0000000000 --- a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "payloadName": "genericNeutronNet.yml", - "contactId": "jh0003", - "name": "Generic NeutronNet", - "description": "Generic NeutronNet", - "resourceIconPath": "network", - "resourceType": "VL", - "categories": [ - { - "name": "Generic", - "subcategories": [ - { - "name": "Network Elements" - } - ] - } -], - "tags": [ - "Generic NeutronNet" - ] -} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml deleted file mode 100644 index 12dc13e98b..0000000000 --- a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.yml +++ /dev/null @@ -1,36 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 -node_types: - org.openecomp.resource.vl.GenericNeutronNet: - derived_from: org.openecomp.resource.vl.extVL - description: Generic Neutron Network - properties: - network_role: - type: string - description: | - Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network - network_assignments: - type: org.openecomp.datatypes.network.NetworkAssignments - network_flows: - type: org.openecomp.datatypes.network.NetworkFlows - network_scope: - type: string - network_ecomp_naming: - type: org.openecomp.datatypes.EcompNaming - network_type: - type: string - description: ECOMP supported network types. - default: NEUTRON - provider_network: - type: org.openecomp.datatypes.network.ProviderNetwork - network_technology: - type: string - description: ECOMP supported network technology - default: NEUTRON - network_homing: - type: org.openecomp.datatypes.EcompHoming - capabilities: - virtual_linkable: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip deleted file mode 100644 index ed51f834f3..0000000000 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip and /dev/null differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.json b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.json deleted file mode 100644 index 8c556b9ff1..0000000000 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "payloadName": "overlayTunnel.yml", - "contactId": "jh0003", - "name": "VL OVERLAYTUNNEL", - "description": "The node represents a overlay tunnel entity.", - "resourceIconPath": "network", - "resourceType": "VL", - "categories": [ - { - "name": "Network Connectivity", - "subcategories": [ - { - "name": "Virtual Links" - } - ] - } - ], - "tags": [ - "VL OVERLAYTUNNEL" - ] -} diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml deleted file mode 100644 index 51a8ce539e..0000000000 --- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml +++ /dev/null @@ -1,142 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 -description: overlay L3 vpn type definitions - -# ***************************************************************************** -# overlay tunnel type definitions -# ***************************************************************************** - -metadata: - id: overlayTunnelDefinition - version: 0.1 - vendor: ONAP - template_author: ONAP - -# ***************************************************************************** -# node types -# ***************************************************************************** - -node_types: - - # ***************************************************************************** - # Overlay tunnel service - # ***************************************************************************** - - org.openecomp.resource.vl.overlaytunnel: - derived_from: tosca.nodes.Root - description: This entity represents abstract overlay tunnel end point. - properties: - id: - type: string - description: Identifier of the Tunnel Endpoint node. - required: false - template_name: - type: string - required: false - version: - type: string - required: false - name: - type: string - description: Overlay tunnel name used by for reference by the administrator. - required: false - description: - type: string - description: Additional comments/information about overlay tunnel. - required: false - tunnelType: - type: string - constraints: - - valid_values: ['L3-DCI','L2-DCI'] - description: type defines if the overlay tunnel is L3-DCI tunnel or L2-DCI tunnel. - required: true - site1_id: - type: string - description: Identifier of first DCI overlay tunnel endpoint. This could be IP address of domain controller. - required: true - site1_description: - type: string - description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. - required: false - site1_networkName: - type: string - description: Name of the network that is being associated with overlay tunnel. - required: true - site1_routerId: - type: string - description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. - required: false - site1_importRT1: - type: string - description: List of Route targets imported by the local router. - required: false - site1_exportRT1: - type: string - description: List of Route targets exported by the local router. - required: false - site1_vni: - type: integer - description: VXLAN ID - required: false - site1_fireWallEnable: - type: boolean - required: false - description: Identifies if a firewall exists in the path of overlay tunnel. - default: false - site1_fireWallId: - type: string - description: Identifier of Firewall that is in overlay tunnel path - required: false - site1_localNetworkAll: - type: boolean - description: Identifies whether all the local networks associate with the tunnel or not. - required: false - default: 'false' - site2_id: - type: string - description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. - required: true - site2_description: - type: string - description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. - required: false - site2_networkName: - type: string - description: Name of the network that is being associated with overlay tunnel. - required: true - site2_routerId: - type: string - description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. - required: false - site2_importRT1: - type: string - description: List of Route targets imported by the local router. - required: false - site2_exportRT1: - type: string - description: List of Route targets exported by the local router. - required: false - site2_vni: - type: integer - description: VXLAN ID - required: false - site2_fireWallEnable: - type: boolean - required: false - description: Identifies if a firewall exists in the path of overlay tunnel. - default: false - site2_fireWallId: - type: string - description: Identifier of Firewall that is in overlay tunnel path - required: false - site2_localNetworkAll: - type: boolean - description: Identifies whether all the local networks associate with the tunnel or not. - required: false - default: 'false' - requirements: - - virtualLink: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - capabilities: - virtual_linkable: - type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip deleted file mode 100644 index 9340f06ca7..0000000000 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip and /dev/null differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json deleted file mode 100644 index 1311fe9f32..0000000000 --- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "payloadName": "underlayVpn.yml", - "contactId": "jh0003", - "name": "VL UNDERLAYVPN", - "description": "The node represents a underlay vpn entity", - "resourceIconPath": "network", - "resourceType": "VL", - "categories": [ - { - "name": "Network Connectivity", - "subcategories": [ - { - "name": "Virtual Links" - } - ] - } - ], - "tags": [ - "VL UNDERLAYVPN" - ] -} diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml deleted file mode 100644 index 1e22852c75..0000000000 --- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml +++ /dev/null @@ -1,162 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0 -description: underlay L3 vpn type definitions -# ***************************************************************************** -# underlay vpn type definitions -# ***************************************************************************** - -metadata: - id: underlayVpnDefinition - version: 0.1 - vendor: ONAP - template_author: ONAP - -# ***************************************************************************** -# node types -# ***************************************************************************** - -node_types: - - # ***************************************************************************** - # Underlayvpn Node Types - # ***************************************************************************** - org.openecomp.resource.vl.underlayvpn: - derived_from: tosca.nodes.Root - description: undelay vpn type definitions - properties: - id: - type: string - required: false - template_name: - type: string - required: false - version: - type: string - required: false - vendor: - type: string - required: false - template_author: - type: string - required: false - name: - type: string - required: false - description: - type: string - required: false - serviceType: - type: string - description: type of VPN service - required: false - default: 'l3vpn_sptn' - topology: - type: string - description: type of VPN topology - constraints: - - valid_values: ['full-mesh','point_to_multipoint','point_to_point','singlePoint','hubspoke','hubspoke_via_hubce','hubspoke_disjoint','ADD_DROP_Z'] - required: false - default: 'full-mesh' - technology: - type: string - description: type of VPN technology - constraints: - - valid_values: ['mpls','rosen multivpn','vxlan overlay l3vpn','eth over sdh','vlan'] - required: false - default: 'mpls' - site1_name: - type: string - description: name of first site - required: false - site2_name: - type: string - description: name of second site - required: false - sna1_name: - type: string - description: name of site network accesses associated with the site1 - required: false - sna2_name: - type: string - description: name of site network accesses associated with the site2 - required: false - pe1_id: - type: string - description: id of provider edge1, it can be name or ip or uuid - required: false - pe2_id: - type: string - description: id of provider edge2, it can be name or ip or uuid - required: false - ac1_id: - type: string - description: id of attachment circuit1, it can be port name or uuid - required: false - ac1_svlan: - type: integer - description: ac1 svlan - required: false - ac1_ip: - type: string - description: ip of ac1, only for layer3 vpn, it should contain mask - required: false - ac1_peer_ip: - type: string - description: ip of ac1 peer CE tp, only for layer3 vpn, it should contain mask - required: false - ac1_route: - type: string - description: route configure of ac1, only for layer3 vpn - required: false - ac1_protocol: - type: string - description: routing protocol type of ac1, only for layer3 vpn - constraints: - - valid_values: ['STATIC','OSPF','ISIS','BGP','other'] - required: false - ac1_protocol_bgp_as: - type: string - description: autonomous-system number of ac1, , only required for ebgp protocol - required: false - ac2_id: - type: string - description: id of attachment circuit2, it can be port name or uuid - required: false - ac2_svlan: - type: integer - description: ac2 svlan - required: false - ac2_ip: - type: string - description: ip of ac2, only for layer3 vpn, it should contain mask - required: false - ac2_peer_ip: - type: string - description: ip of ac2 peer CE tp, only for layer3 vpn, it should contain mask - required: false - ac2_route: - type: string - description: route configure of ac2, only for layer3 vpn - required: false - ac2_protocol: - type: string - description: routing protocol type of ac2, only for layer3 vpn - constraints: - - valid_values: ['STATIC','OSPF','ISIS','BGP','other'] - default: 'STATIC' - required: false - ac2_protocol_bgp_as: - type: string - description: autonomous-system number of ac2, , only required for ebgp protocol - required: false - af_type: - type: string - description: address family type - default: 'ipv4' - required: false - requirements: - - virtualLink: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - capabilities: - virtual_linkable: - type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip deleted file mode 100644 index 65bc805bb7..0000000000 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip and /dev/null differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.json b/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.json new file mode 100644 index 0000000000..22788ec06c --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.json @@ -0,0 +1,15 @@ +{ + "payloadName": "NSD.yml", + "contactId": "jh0003", + "name": "NSD", + "description": "NSD", + "resourceIconPath": "network", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["NSD"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.yml new file mode 100644 index 0000000000..1b3d8820d5 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.yml @@ -0,0 +1,41 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.vfc.NSD: + derived_from: tosca.nodes.Root + description: ECOMP Allotted Resource base type all other allotted resources node types derive from + properties: + nsd_id: + type: string + required: true + description: ID of the NSD + nsd_designer: + type: string + required: true + description: Designer of the NSD + nsd_version: + type: string + required: true + description: Version of the NSD + nsd_name: + type: string + required: true + description: Name of the NSD + providing_service_uuid: + type: string + required: true + description: The depending service uuid in order to map the allotted resource to the specific service version + providing_service_invariant_uuid: + type: string + required: true + description: The depending service invariant uuid in order to map the allotted resource to the specific service version + providing_service_name: + type: string + required: true + description: The depending service name in order to map the allotted resource to the specific service version + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.zip new file mode 100644 index 0000000000..d741b50c16 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.json b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.json new file mode 100644 index 0000000000..5d721d4abc --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.json @@ -0,0 +1,15 @@ +{ + "payloadName": "VDU.yml", + "contactId": "jh0003", + "name": "VDU", + "description": "VDU", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VDU"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml new file mode 100644 index 0000000000..541126f7e3 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml @@ -0,0 +1,22 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VDU: + derived_from: tosca.nodes.SoftwareComponent + capabilities: +#Not found in any spec +# high_availability: +# type: nfv.capabilities.HA + Virtualbinding: + type: tosca.capabilities.nfv.VirtualBindable +# monitoring_parameter: +# type: nfv.capabilities.Metric + requirements: +#Not found in any spec +# - high_availability: +# capability: nfv.capabilities.HA +# relationship: nfv.relationships.HA +# occurrences: [ 0, 1 ] + - host: + capability: tosca.capabilities.Container + node: tosca.nodes.Compute + relationship: tosca.relationships.HostedOn diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip new file mode 100644 index 0000000000..9010bf0544 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.json b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.json new file mode 100644 index 0000000000..143f62346d --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.json @@ -0,0 +1,20 @@ +{ + "payloadName": "allottedResource.yml", + "contactId": "jh0003", + "name": "AllottedResource", + "description": "Allotted Resource base type all other allotted resources node types derive from", + "resourceIconPath": "defaulticon", + "categories": [ + { + "name": "Allotted Resource", + "subcategories": [ + { + "name": "Allotted Resource" + } + ] + } +], + "tags": [ + "AllottedResource" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml new file mode 100644 index 0000000000..00d3bd243d --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml @@ -0,0 +1,38 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.vfc.AllottedResource: + derived_from: tosca.nodes.Root + description: ECOMP Allotted Resource base type all other allotted resources node types derive from + properties: + providing_service_uuid: + type: string + required: true + description: The depending service uuid in order to map the allotted resource to the specific service version + providing_service_invariant_uuid: + type: string + required: true + description: The depending service invariant uuid in order to map the allotted resource to the specific service version + providing_service_name: + type: string + required: true + description: The depending service name in order to map the allotted resource to the specific service version + role: + type: string + required: true + description: Unique label that defines the role that this allotted resource performs + min_instances: + type: integer + default: 1 + max_instances: + type: integer + default: 1 + target_network_role: + type: string + required: true + description: Target network role + requirements: + - service_dependency: + capability: org.openecomp.capabilities.AllottedResource + relationship: tosca.relationships.DependsOn + node: tosca.services.Root + diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip new file mode 100644 index 0000000000..fd3f7e9d79 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.json b/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.json new file mode 100644 index 0000000000..49895e44a6 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extImageFile.yml", + "contactId": "jh0003", + "name": "Ext Image File", + "description": "Ext Image File", + "resourceIconPath": "defaulticon", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["Ext Image File"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.yml new file mode 100644 index 0000000000..0715993b40 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.yml @@ -0,0 +1,25 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.ImageFile: + derived_from: tosca.nodes.Root + properties: + file_url: + type: string + required: false + container_type: + type: string + required: false + name: + type: string + required: false + disk_format: + type: string + required: false + version: + type: string + required: false + capabilities: + guest_os: + type: tosca.capabilities.nfv.ext.GuestOs + image_fle: + type: tosca.capabilities.nfv.ext.ImageFile diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.zip new file mode 100644 index 0000000000..acee384754 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.json b/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.json new file mode 100644 index 0000000000..6cfdd47b1e --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extLocalStorage.yml", + "contactId": "jh0003", + "name": "Ext Local Storage", + "description": "Ext Local Storage", + "resourceIconPath": "objectStorage", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["Ext Local Storage"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.yml new file mode 100644 index 0000000000..4650332c21 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.yml @@ -0,0 +1,14 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.LocalStorage: + derived_from: tosca.nodes.Root + properties: + size: + type: string + required: false + disk_type: + type: string + required: false + capabilities: + local_attachment: + type: tosca.capabilities.nfv.ext.LocalAttachment \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.zip new file mode 100644 index 0000000000..b3bcc91c90 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.json b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.json new file mode 100644 index 0000000000..955e5e3e30 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteCP.yml", + "contactId": "jh0003", + "name": "ext ZTE CP", + "description": "Ext ZTE CP", + "resourceIconPath": "network", + "resourceType": "CP", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["ext ZTE CP"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.yml new file mode 100644 index 0000000000..207047a3d7 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.yml @@ -0,0 +1,76 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.zte.CP: + derived_from: tosca.nodes.Root + properties: + guest_os_mtu: + type: integer + required: false + bandwidth: + type: integer + required: false + interface_name: + type: string + required: false + allowed_address_pairs: + type: list + required: false + entry_schema: + type: tosca.datatypes.nfv.ext.AddressPairs + ip_address: + type: string + required: false + bond: + type: string + required: false + proxiedVNFs: + type: list + required: false + entry_schema: + type: string + sfc_encapsulation: + type: string + required: false + floating_ip_address: + type: tosca.datatypes.nfv.ext.FloatingIP + required: false + service_ip_address: + required: false + type: string + mac_address: + type: string + required: false + proxiedVNFtype: + type: string + required: false + macbond: + type: string + required: false + vnic_type: + type: string + required: false + direction: + type: string + required: false + order: + type: integer + required: false + requirements: + - forwarder: + capability: tosca.capabilities.nfv.Forwarder + occurrences: + - 0 + - UNBOUNDED + - virtualbinding: + capability: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 0 + - UNBOUNDED + - virtualLink: + capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: + - 0 + - UNBOUNDED + capabilities: + forwarder: + type: tosca.capabilities.nfv.Forwarder \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.zip new file mode 100644 index 0000000000..ca6d0738de Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.json b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.json new file mode 100644 index 0000000000..2ebc518c0c --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteVDU.yml", + "contactId": "jh0003", + "name": "Ext Zte VDU", + "description": "Ext Zte VDU", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["Ext Zte VDU"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.yml new file mode 100644 index 0000000000..1638305021 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.yml @@ -0,0 +1,67 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.zte.VDU: + derived_from: tosca.nodes.Root + properties: + manual_scale_select_vim: + type: boolean + required: false + vdu_type: + type: string + required: false + watchdog: + type: tosca.datatypes.nfv.ext.zte.WatchDog + required: false + name: + type: string + required: false + local_affinity_antiaffinity_rule: + type: tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule + required: false + support_scaling: + type: boolean + required: false + storage_policy: + type: string + required: false + key_vdu: + type: boolean + required: false + location_info: + type: tosca.datatypes.nfv.ext.LocationInfo + required: false + inject_data_list: + type: list + required: false + entry_schema: + type: tosca.datatypes.nfv.ext.InjectData + requirements: + - guest_os: + capability: tosca.capabilities.nfv.ext.GuestOs + occurrences: + - 0 + - UNBOUNDED + - local_storage: + capability: tosca.capabilities.nfv.ext.LocalAttachment + occurrences: + - 0 + - UNBOUNDED + - volume_storage: + capability: tosca.capabilities.Attachment + occurrences: + - 0 + - UNBOUNDED + - dependency: + capability: tosca.capabilities.Node + occurrences: + - 0 + - UNBOUNDED + capabilities: + scalable: + type: tosca.capabilities.Scalable + monitoring_parameter: + type: tosca.capabilities.nfv.Metric + nfv_compute: + type: tosca.capabilities.nfv.ext.Compute.Container.Architecture + virtualbinding: + type: tosca.capabilities.nfv.VirtualBindable \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.zip new file mode 100644 index 0000000000..2bf0f54ea3 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.json b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.json new file mode 100644 index 0000000000..0104a79c21 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.json @@ -0,0 +1,15 @@ +{ + "payloadName": "extZteVL.yml", + "contactId": "jh0003", + "name": "ext ZTE VL", + "description": "Ext ZTE VL", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["ext ZTE VL"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.yml new file mode 100644 index 0000000000..8618019587 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.yml @@ -0,0 +1,69 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.ext.zte.VL: + derived_from: tosca.nodes.Root + properties: + segmentation_id: + type: string + required: false + network_name: + type: string + required: false + is_predefined: + type: boolean + required: false + mtu: + type: integer + required: false + dns_nameservers: + type: list + required: false + entry_schema: + type: string + physical_network: + type: string + required: false + dhcp_enabled: + type: boolean + required: false + network_id: + type: string + required: false + host_routes: + type: list + required: false + entry_schema: + type: tosca.datatypes.nfv.ext.HostRouteInfo + ip_version: + type: integer + required: false + vendor: + type: string + required: false + name: + type: string + required: false + start_ip: + type: string + required: false + vlan_transparent: + type: boolean + required: false + cidr: + type: string + required: false + gateway_ip: + type: string + required: false + network_type: + type: string + required: false + end_ip: + type: string + required: false + location_info: + type: tosca.datatypes.nfv.ext.LocationInfo + required: false + capabilities: + virtual_linkable: + type: tosca.capabilities.nfv.VirtualLinkable \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.zip new file mode 100644 index 0000000000..5f04404f25 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.json b/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.json new file mode 100644 index 0000000000..d9b008a870 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.json @@ -0,0 +1,21 @@ +{ + "payloadName": "genericNeutronNet.yml", + "contactId": "jh0003", + "name": "Generic NeutronNet", + "description": "Generic NeutronNet", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Network Elements" + } + ] + } +], + "tags": [ + "Generic NeutronNet" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.yml new file mode 100644 index 0000000000..12dc13e98b --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.yml @@ -0,0 +1,36 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +node_types: + org.openecomp.resource.vl.GenericNeutronNet: + derived_from: org.openecomp.resource.vl.extVL + description: Generic Neutron Network + properties: + network_role: + type: string + description: | + Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network + network_assignments: + type: org.openecomp.datatypes.network.NetworkAssignments + network_flows: + type: org.openecomp.datatypes.network.NetworkFlows + network_scope: + type: string + network_ecomp_naming: + type: org.openecomp.datatypes.EcompNaming + network_type: + type: string + description: ECOMP supported network types. + default: NEUTRON + provider_network: + type: org.openecomp.datatypes.network.ProviderNetwork + network_technology: + type: string + description: ECOMP supported network technology + default: NEUTRON + network_homing: + type: org.openecomp.datatypes.EcompHoming + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable + occurrences: + - 1 + - UNBOUNDED \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.zip new file mode 100644 index 0000000000..ed51f834f3 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.json b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.json new file mode 100644 index 0000000000..8c556b9ff1 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.json @@ -0,0 +1,21 @@ +{ + "payloadName": "overlayTunnel.yml", + "contactId": "jh0003", + "name": "VL OVERLAYTUNNEL", + "description": "The node represents a overlay tunnel entity.", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [ + { + "name": "Network Connectivity", + "subcategories": [ + { + "name": "Virtual Links" + } + ] + } + ], + "tags": [ + "VL OVERLAYTUNNEL" + ] +} diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml new file mode 100644 index 0000000000..51a8ce539e --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.yml @@ -0,0 +1,142 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +description: overlay L3 vpn type definitions + +# ***************************************************************************** +# overlay tunnel type definitions +# ***************************************************************************** + +metadata: + id: overlayTunnelDefinition + version: 0.1 + vendor: ONAP + template_author: ONAP + +# ***************************************************************************** +# node types +# ***************************************************************************** + +node_types: + + # ***************************************************************************** + # Overlay tunnel service + # ***************************************************************************** + + org.openecomp.resource.vl.overlaytunnel: + derived_from: tosca.nodes.Root + description: This entity represents abstract overlay tunnel end point. + properties: + id: + type: string + description: Identifier of the Tunnel Endpoint node. + required: false + template_name: + type: string + required: false + version: + type: string + required: false + name: + type: string + description: Overlay tunnel name used by for reference by the administrator. + required: false + description: + type: string + description: Additional comments/information about overlay tunnel. + required: false + tunnelType: + type: string + constraints: + - valid_values: ['L3-DCI','L2-DCI'] + description: type defines if the overlay tunnel is L3-DCI tunnel or L2-DCI tunnel. + required: true + site1_id: + type: string + description: Identifier of first DCI overlay tunnel endpoint. This could be IP address of domain controller. + required: true + site1_description: + type: string + description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. + required: false + site1_networkName: + type: string + description: Name of the network that is being associated with overlay tunnel. + required: true + site1_routerId: + type: string + description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. + required: false + site1_importRT1: + type: string + description: List of Route targets imported by the local router. + required: false + site1_exportRT1: + type: string + description: List of Route targets exported by the local router. + required: false + site1_vni: + type: integer + description: VXLAN ID + required: false + site1_fireWallEnable: + type: boolean + required: false + description: Identifies if a firewall exists in the path of overlay tunnel. + default: false + site1_fireWallId: + type: string + description: Identifier of Firewall that is in overlay tunnel path + required: false + site1_localNetworkAll: + type: boolean + description: Identifies whether all the local networks associate with the tunnel or not. + required: false + default: 'false' + site2_id: + type: string + description: Identifier of second DCI overlay tunnel endpoint. This could be IP address of domain controller. + required: true + site2_description: + type: string + description: Additional comments/information about overlay tunnel. Description can also be used to identify domain controller. + required: false + site2_networkName: + type: string + description: Name of the network that is being associated with overlay tunnel. + required: true + site2_routerId: + type: string + description: Identifier of router connected to L3 tunnel end point, while configuring L3-DCI tunnel. + required: false + site2_importRT1: + type: string + description: List of Route targets imported by the local router. + required: false + site2_exportRT1: + type: string + description: List of Route targets exported by the local router. + required: false + site2_vni: + type: integer + description: VXLAN ID + required: false + site2_fireWallEnable: + type: boolean + required: false + description: Identifies if a firewall exists in the path of overlay tunnel. + default: false + site2_fireWallId: + type: string + description: Identifier of Firewall that is in overlay tunnel path + required: false + site2_localNetworkAll: + type: boolean + description: Identifies whether all the local networks associate with the tunnel or not. + required: false + default: 'false' + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.zip new file mode 100644 index 0000000000..9340f06ca7 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.json new file mode 100644 index 0000000000..1311fe9f32 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.json @@ -0,0 +1,21 @@ +{ + "payloadName": "underlayVpn.yml", + "contactId": "jh0003", + "name": "VL UNDERLAYVPN", + "description": "The node represents a underlay vpn entity", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [ + { + "name": "Network Connectivity", + "subcategories": [ + { + "name": "Virtual Links" + } + ] + } + ], + "tags": [ + "VL UNDERLAYVPN" + ] +} diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.yml new file mode 100644 index 0000000000..1e22852c75 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.yml @@ -0,0 +1,162 @@ +tosca_definitions_version: tosca_simple_yaml_1_0 +description: underlay L3 vpn type definitions +# ***************************************************************************** +# underlay vpn type definitions +# ***************************************************************************** + +metadata: + id: underlayVpnDefinition + version: 0.1 + vendor: ONAP + template_author: ONAP + +# ***************************************************************************** +# node types +# ***************************************************************************** + +node_types: + + # ***************************************************************************** + # Underlayvpn Node Types + # ***************************************************************************** + org.openecomp.resource.vl.underlayvpn: + derived_from: tosca.nodes.Root + description: undelay vpn type definitions + properties: + id: + type: string + required: false + template_name: + type: string + required: false + version: + type: string + required: false + vendor: + type: string + required: false + template_author: + type: string + required: false + name: + type: string + required: false + description: + type: string + required: false + serviceType: + type: string + description: type of VPN service + required: false + default: 'l3vpn_sptn' + topology: + type: string + description: type of VPN topology + constraints: + - valid_values: ['full-mesh','point_to_multipoint','point_to_point','singlePoint','hubspoke','hubspoke_via_hubce','hubspoke_disjoint','ADD_DROP_Z'] + required: false + default: 'full-mesh' + technology: + type: string + description: type of VPN technology + constraints: + - valid_values: ['mpls','rosen multivpn','vxlan overlay l3vpn','eth over sdh','vlan'] + required: false + default: 'mpls' + site1_name: + type: string + description: name of first site + required: false + site2_name: + type: string + description: name of second site + required: false + sna1_name: + type: string + description: name of site network accesses associated with the site1 + required: false + sna2_name: + type: string + description: name of site network accesses associated with the site2 + required: false + pe1_id: + type: string + description: id of provider edge1, it can be name or ip or uuid + required: false + pe2_id: + type: string + description: id of provider edge2, it can be name or ip or uuid + required: false + ac1_id: + type: string + description: id of attachment circuit1, it can be port name or uuid + required: false + ac1_svlan: + type: integer + description: ac1 svlan + required: false + ac1_ip: + type: string + description: ip of ac1, only for layer3 vpn, it should contain mask + required: false + ac1_peer_ip: + type: string + description: ip of ac1 peer CE tp, only for layer3 vpn, it should contain mask + required: false + ac1_route: + type: string + description: route configure of ac1, only for layer3 vpn + required: false + ac1_protocol: + type: string + description: routing protocol type of ac1, only for layer3 vpn + constraints: + - valid_values: ['STATIC','OSPF','ISIS','BGP','other'] + required: false + ac1_protocol_bgp_as: + type: string + description: autonomous-system number of ac1, , only required for ebgp protocol + required: false + ac2_id: + type: string + description: id of attachment circuit2, it can be port name or uuid + required: false + ac2_svlan: + type: integer + description: ac2 svlan + required: false + ac2_ip: + type: string + description: ip of ac2, only for layer3 vpn, it should contain mask + required: false + ac2_peer_ip: + type: string + description: ip of ac2 peer CE tp, only for layer3 vpn, it should contain mask + required: false + ac2_route: + type: string + description: route configure of ac2, only for layer3 vpn + required: false + ac2_protocol: + type: string + description: routing protocol type of ac2, only for layer3 vpn + constraints: + - valid_values: ['STATIC','OSPF','ISIS','BGP','other'] + default: 'STATIC' + required: false + ac2_protocol_bgp_as: + type: string + description: autonomous-system number of ac2, , only required for ebgp protocol + required: false + af_type: + type: string + description: address family type + default: 'ipv4' + required: false + requirements: + - virtualLink: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + capabilities: + virtual_linkable: + type: tosca.capabilities.network.Linkable diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.zip new file mode 100644 index 0000000000..65bc805bb7 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.json b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.json new file mode 100644 index 0000000000..42f5978ad1 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vduCompute.yml", + "contactId": "jh0003", + "name": "VDU Compute", + "description": "VDU Compute", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VDU Compute"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml new file mode 100644 index 0000000000..a1c4b486b6 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml @@ -0,0 +1,96 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VDU.Compute: + derived_from: tosca.nodes.Root + properties: + configurable_properties: + type: map + required: true + status: SUPPORTED + entry_schema: + type: tosca.datatypes.nfv.VnfcConfigurableProperties + name: + type: string + required: true + status: SUPPORTED + nfvi_constraints: + type: list + required: false + status: SUPPORTED + entry_schema: + type: string + descrption: + type: string + required: true + status: SUPPORTED + boot_order: + type: list + required: false + status: SUPPORTED + entry_schema: + type: string + attributes: + private_address: + type: string + status: SUPPORTED + public_address: + type: string + status: SUPPORTED + networks: + type: string + status: SUPPORTED + ports: + type: string + status: SUPPORTED + requirements: + - local_storage: + capability: tosca.capabilities.Attachment + occurrences: + - 0 + - UNBOUNDED + - virtual_storage: + capability: tosca.capabilities.nfv.VirtualStorage + occurrences: + - 0 + - UNBOUNDED + capabilities: + scalable: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + virtual_compute: + type: tosca.capabilities.nfv.VirtualCompute + occurrences: + - 1 + - UNBOUNDED + endpoint: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + os: + type: tosca.capabilities.OperatingSystem + occurrences: + - 1 + - UNBOUNDED + virtual_binding: + type: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 1 + - UNBOUNDED + host: + type: tosca.capabilities.Container + occurrences: + - 1 + - UNBOUNDED + binding: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + monitoring_parameter: + type: tosca.capabilities.nfv.Metric + occurrences: + - 1 + - UNBOUNDED \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip new file mode 100644 index 0000000000..311062658f Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json new file mode 100644 index 0000000000..f8d2254472 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vduCpd.yml", + "contactId": "jh0003", + "name": "VDU Cpd", + "description": "VDU Cpd", + "resourceIconPath": "port", + "resourceType": "CP", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Network Elements" + }] + }], + "tags": ["VDU Cpd"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml new file mode 100644 index 0000000000..673e923182 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml @@ -0,0 +1,57 @@ +#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!! +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VduCpd: + derived_from: tosca.nodes.Root + properties: + virtual_network_interface_requirements: + type: list + required: false + status: SUPPORTED + entry_schema: + type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements + role: + type: string + required: false + status: SUPPORTED + constraints: + - valid_values: + - root + - leaf + bitrate_requirement: + type: integer + required: false + status: SUPPORTED + description: + type: string + required: false + status: SUPPORTED + layer_protocol: + type: string + required: true + status: SUPPORTED + constraints: + - valid_values: + - ethernet + - mpls + - odu2 + - ipv4 + - ipv6 + - pseudo_wire + address_data: + type: list + required: false + status: SUPPORTED + entry_schema: + type: tosca.datatype.nfv.AddressData + requirements: + - virtual_binding: + capability: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 0 + - UNBOUNDED + - virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + occurrences: + - 0 + - UNBOUNDED \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip new file mode 100644 index 0000000000..e1bb32dd23 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.json b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.json new file mode 100644 index 0000000000..7dab2ece94 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vduVirtualStorage.yml", + "contactId": "jh0003", + "name": "VDU VirtualStorage", + "description": "VDU VirtualStorage", + "resourceIconPath": "objectStorage", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VDU VirtualStorage"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml new file mode 100644 index 0000000000..5d22e1e6d4 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml @@ -0,0 +1,27 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VDU.VirtualStorage: + derived_from: tosca.nodes.Root + properties: + id: + type: string + required: true + status: SUPPORTED + size_of_storage: + type: string + required: true + status: SUPPORTED + rdma_enabled: + type: boolean + required: false + status: SUPPORTED + type_of_storage: + type: string + required: true + status: SUPPORTED + capabilities: + virtual_storage: + type: tosca.capabilities.nfv.VirtualStorage + occurrences: + - 1 + - UNBOUNDED diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip new file mode 100644 index 0000000000..fb92ab45d9 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.json b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.json new file mode 100644 index 0000000000..b591df2bbb --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vnfVirtualLinkDesc.yml", + "contactId": "jh0003", + "name": "VnfVirtualLinkDesc", + "description": "VnfVirtualLinkDesc", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VnfVirtualLinkDesc"] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml new file mode 100644 index 0000000000..ecb5e0bb52 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.yml @@ -0,0 +1,26 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VnfVirtualLinkDesc: + derived_from: tosca.nodes.Root + properties: + connectivity_type: + type: tosca.datatypes.nfv.ConnectivityType + required: true + description: + type: string + required: false + test_access: + type: list + entry_schema: + type: string + required: false + vl_flavours: + type: map + entry_schema: + type: tosca.datatypes.nfv.VlFlavour + required: true + capabilities: + #monitoring_parameters: + # modeled as ad hoc (named) capabilities in node template + virtual_linkable: + type: tosca.capabilities.nfv.VirtualLinkable \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip new file mode 100644 index 0000000000..3d29909033 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json deleted file mode 100644 index 143f62346d..0000000000 --- a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "payloadName": "allottedResource.yml", - "contactId": "jh0003", - "name": "AllottedResource", - "description": "Allotted Resource base type all other allotted resources node types derive from", - "resourceIconPath": "defaulticon", - "categories": [ - { - "name": "Allotted Resource", - "subcategories": [ - { - "name": "Allotted Resource" - } - ] - } -], - "tags": [ - "AllottedResource" - ] -} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml deleted file mode 100644 index 00d3bd243d..0000000000 --- a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.yml +++ /dev/null @@ -1,38 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.AllottedResource: - derived_from: tosca.nodes.Root - description: ECOMP Allotted Resource base type all other allotted resources node types derive from - properties: - providing_service_uuid: - type: string - required: true - description: The depending service uuid in order to map the allotted resource to the specific service version - providing_service_invariant_uuid: - type: string - required: true - description: The depending service invariant uuid in order to map the allotted resource to the specific service version - providing_service_name: - type: string - required: true - description: The depending service name in order to map the allotted resource to the specific service version - role: - type: string - required: true - description: Unique label that defines the role that this allotted resource performs - min_instances: - type: integer - default: 1 - max_instances: - type: integer - default: 1 - target_network_role: - type: string - required: true - description: Target network role - requirements: - - service_dependency: - capability: org.openecomp.capabilities.AllottedResource - relationship: tosca.relationships.DependsOn - node: tosca.services.Root - diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip b/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip deleted file mode 100644 index fd3f7e9d79..0000000000 Binary files a/catalog-be/src/main/resources/import/tosca/normative-types/allottedResource/allottedResource.zip and /dev/null differ diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py new file mode 100644 index 0000000000..019067b849 --- /dev/null +++ b/catalog-be/src/main/resources/scripts/import/tosca/importNfvTypes.py @@ -0,0 +1,113 @@ +import pycurl +import sys, getopt +from StringIO import StringIO +import json +import copy +from importCommon import * +from importNormativeTypes import * +import importCommon + +##################################################################################################################################################################################################### +# # +# Import Nfv Types from a given file # +# # +# activation : # +# python importNfvTypes.py [optional -s | --scheme=, default http] [-i | --ip=] [-p | --port= ] [-f | --ifile= ] # +# # +# shortest activation (be host = localhost, be port = 8080): # +# python importUsers.py [-f | --ifile= ] # +# # +##################################################################################################################################################################################################### + +def importNfvTypes(scheme, beHost, bePort, adminUser, fileDir, updateversion): + + nfvTypes = [ "underlayVpn", + "overlayTunnel", + "genericNeutronNet", + "allottedResource", + "extImageFile", + "extLocalStorage", + "extZteCP", + "extZteVDU", + "extZteVL", + "NSD", + "VDU", + "vduCompute", + "vduCpd", + "vduVirtualStorage", + "vnfVirtualLinkDesc" + ] + + responseCodes = [200, 201] + + if(updateversion == 'false'): + responseCodes = [200, 201, 409] + + results = [] + for nfvType in nfvTypes: + result = createNormativeType(scheme, beHost, bePort, adminUser, fileDir, nfvType, updateversion) + results.append(result) + if ( result[1] == None or result[1] not in responseCodes) : + print "Failed creating heat type " + nfvType + ". " + str(result[1]) + return results + + +def main(argv): + print 'Number of arguments:', len(sys.argv), 'arguments.' + + beHost = 'localhost' + bePort = '8080' + adminUser = 'jh0003' + updateversion = 'true' + scheme = 'http' + + try: + opts, args = getopt.getopt(argv,"i:p:u:v:h:",["ip=","port=","user=","updateversion="]) + except getopt.GetoptError: + usage() + errorAndExit(2, 'Invalid input') + + for opt, arg in opts: + #print opt, arg + if opt == '-h': + usage() + sys.exit(3) + elif opt in ("-i", "--ip"): + beHost = arg + elif opt in ("-p", "--port"): + bePort = arg + elif opt in ("-u", "--user"): + adminUser = arg + elif opt in ("-s", "--scheme"): + scheme = arg + elif opt in ("-v", "--updateversion"): + if (arg.lower() == "false" or arg.lower() == "no"): + updateversion = 'false' + + print 'scheme =',scheme,',be host =',beHost,', be port =', bePort,', user =', adminUser + + if ( beHost == None ): + usage() + sys.exit(3) + + results = importNfvTypes(scheme, beHost, bePort, adminUser, "../../../import/tosca/nfv-types/", updateversion) + + print "-----------------------------" + for result in results: + print "{0:20} | {1:6}".format(result[0], result[1]) + print "-----------------------------" + + responseCodes = [200, 201] + + if(updateversion == 'false'): + responseCodes = [200, 201, 409] + + failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) + if (len(failedNormatives) > 0): + errorAndExit(1, None) + else: + errorAndExit(0, None) + + +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py index df2cd49687..5b7b52d0a1 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py @@ -87,7 +87,7 @@ def usage(): def importNormativeTypes(scheme, beHost, bePort, adminUser, fileDir, updateversion): - normativeTypes = [ "root", "compute", "softwareComponent", "webServer", "webApplication", "DBMS", "database", "objectStorage", "blockStorage", "containerRuntime", "containerApplication", "loadBalancer", "port", "network", "allottedResource"] + normativeTypes = [ "root", "compute", "softwareComponent", "webServer", "webApplication", "DBMS", "database", "objectStorage", "blockStorage", "containerRuntime", "containerApplication", "loadBalancer", "port", "network"] #normativeTypes = [ "root" ] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py index eb55bf84bc..6144d69104 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py @@ -8,7 +8,9 @@ import time from importNormativeElements import * from importNormativeTypes import importNormativeTypes from importHeatTypes import importHeatTypes +from importNfvTypes import importNfvTypes from importOnapTypes import importOnapTypes +from importSolTypes import importSolTypes from importNormativeCapabilities import importNormativeCapabilities from importCategoryTypes import importCategories from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType @@ -125,11 +127,19 @@ def main(argv): fileLocation = baseFileLocation + "heat-types/" resultsHeat = importHeatTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) handleResults(resultsHeat, updateversion) - + + fileLocation = baseFileLocation + "nfv-types/" + resultsHeat = importNfvTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) + handleResults(resultsHeat, updateversion) + fileLocation = baseFileLocation + "onap-types/" resultsHeat = importOnapTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) handleResults(resultsHeat, updateversion) - + + fileLocation = baseFileLocation + "sol-types/" + resultsHeat = importSolTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) + handleResults(resultsHeat, updateversion) + fileLocation = baseFileLocation + "group-types/" importGroupTypes(scheme, beHost, bePort, adminUser, False, fileLocation) @@ -139,5 +149,5 @@ def main(argv): errorAndExit(0, None) if __name__ == "__main__": - main(sys.argv[1:]) + main(sys.argv[1:]) diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py index faad226d39..f703b4b4ac 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -20,19 +20,9 @@ import importCommon ##################################################################################################################################################################################################### def importOnapTypes(scheme, beHost, bePort, adminUser, fileDir, updateversion): - - onapTypes = [ "extImageFile", - "extLocalStorage", - "extZteCP", - "extZteVDU", - "extZteVL", - "NSD", - "VDU", - "vduCompute", - "vduCpd", - "vduVirtualStorage", - "vnfVirtualLinkDesc" - ] + + #Add desired type names to the list + onapTypes = [] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importSolTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importSolTypes.py new file mode 100644 index 0000000000..0015a26655 --- /dev/null +++ b/catalog-be/src/main/resources/scripts/import/tosca/importSolTypes.py @@ -0,0 +1,99 @@ +import pycurl +import sys, getopt +from StringIO import StringIO +import json +import copy +from importCommon import * +from importNormativeTypes import * +import importCommon + +##################################################################################################################################################################################################### +# # +# Import Sol Types from a given file # +# # +# activation : # +# python importSolTypes.py [optional -s | --scheme=, default http] [-i | --ip=] [-p | --port= ] [-f | --ifile= ] # +# # +# shortest activation (be host = localhost, be port = 8080): # +# python importUsers.py [-f | --ifile= ] # +# # +##################################################################################################################################################################################################### + +def importSolTypes(scheme, beHost, bePort, adminUser, fileDir, updateversion): + + #Add desired type names to the list + solTypes = [] + + responseCodes = [200, 201] + + if(updateversion == 'false'): + responseCodes = [200, 201, 409] + + results = [] + for onapType in solTypes: + result = createNormativeType(scheme, beHost, bePort, adminUser, fileDir, onapType, updateversion) + results.append(result) + if ( result[1] == None or result[1] not in responseCodes) : + print "Failed creating heat type " + onapType + ". " + str(result[1]) + return results + + +def main(argv): + print 'Number of arguments:', len(sys.argv), 'arguments.' + + beHost = 'localhost' + bePort = '8080' + adminUser = 'jh0003' + updateversion = 'true' + scheme = 'http' + + try: + opts, args = getopt.getopt(argv,"i:p:u:v:h:",["ip=","port=","user=","updateversion="]) + except getopt.GetoptError: + usage() + errorAndExit(2, 'Invalid input') + + for opt, arg in opts: + #print opt, arg + if opt == '-h': + usage() + sys.exit(3) + elif opt in ("-i", "--ip"): + beHost = arg + elif opt in ("-p", "--port"): + bePort = arg + elif opt in ("-u", "--user"): + adminUser = arg + elif opt in ("-s", "--scheme"): + scheme = arg + elif opt in ("-v", "--updateversion"): + if (arg.lower() == "false" or arg.lower() == "no"): + updateversion = 'false' + + print 'scheme =',scheme,',be host =',beHost,', be port =', bePort,', user =', adminUser + + if ( beHost == None ): + usage() + sys.exit(3) + + results = importSolTypes(scheme, beHost, bePort, adminUser, "../../../import/tosca/sol-types/", updateversion) + + print "-----------------------------" + for result in results: + print "{0:20} | {1:6}".format(result[0], result[1]) + print "-----------------------------" + + responseCodes = [200, 201] + + if(updateversion == 'false'): + responseCodes = [200, 201, 409] + + failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) + if (len(failedNormatives) > 0): + errorAndExit(1, None) + else: + errorAndExit(0, None) + + +if __name__ == "__main__": + main(sys.argv[1:]) diff --git a/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json index 6045ddd6ff..9101291fc9 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json +++ b/catalog-be/src/main/resources/scripts/import/tosca/onapTypesToUpgrade.json @@ -1,4 +1,8 @@ { + "nfv": [ + ], "onap": [ + ], + "sol":[ ] } \ No newline at end of file diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNfvTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNfvTypes.py new file mode 100644 index 0000000000..66d82f9e91 --- /dev/null +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNfvTypes.py @@ -0,0 +1,104 @@ +import pycurl +import sys, getopt +from StringIO import StringIO +import json +import copy +from importCommon import * +from importNormativeTypes import * +import importCommon +import json + + +################################################################################################################################################################################################ +# # +# Upgrades all Heat and Normative types confiugred in "typesToUpgrade.json" file # +# # +# activation # +# python upgradeHeatAndNormativeTypes.py [-s | --scheme= ] [-i | --ip=] [-p | --port= ] [-f | --ifile= ] # +# # +# shortest activation (be host = localhost, be port = 8080): # +# python upgradeHeatAndNormativeTypes.py [-f | --ifile= ] # +# # +################################################################################################################################################################################################ +def upgradeNfvTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseDir, updateversion): + responseCodes = [200, 201] + if (updateversion == 'false'): + responseCodes = [200, 201, 409] + with open("onapTypesToUpgrade.json", 'r') as stream: + try: + types = json.load(stream) + nfvTypes = types["nfv"] + debug(nfvTypes) + nfvFileDir = baseDir + "nfv-types/" + debug(nfvFileDir) + results = [] + for nfvType in nfvTypes: + result = createNormativeType(scheme, beHost, bePort, adminUser, nfvFileDir, nfvType.encode('ascii', 'ignore'), updateversion) + results.append(result) + if (result[1] == None or result[1] not in responseCodes): + print "Failed creating nfv type " + nfvType + ". " + str(result[1]) + except yaml.YAMLError as exc: + print(exc) + + + +def main(argv): + print 'Number of arguments:', len(sys.argv), 'arguments.' + + beHost = 'localhost' + bePort = '8080' + adminUser = 'jh0003' + updateversion = 'true' + scheme = 'http' + + try: + opts, args = getopt.getopt(argv, "i:p:u:v:h:s:", ["ip=", "port=", "user=", "updateversion=","scheme="]) + except getopt.GetoptError: + usage() + errorAndExit(2, 'Invalid input') + + for opt, arg in opts: + # print opt, arg + if opt == '-h': + usage() + sys.exit(3) + elif opt in ("-i", "--ip"): + beHost = arg + elif opt in ("-p", "--port"): + bePort = arg + elif opt in ("-u", "--user"): + adminUser = arg + elif opt in ("-s", "--scheme"): + scheme = arg + elif opt in ("-v", "--updateversion"): + if (arg.lower() == "false" or arg.lower() == "no"): + updateversion = 'false' + + print 'scheme =',scheme,', be host =',beHost, ', be port =', bePort, ', user =', adminUser + + if (beHost == None): + usage() + sys.exit(3) + + results = upgradeNfvTypesPerConfigFile(scheme, beHost, bePort, adminUser, "../../../import/tosca/", updateversion) + + print "-----------------------------" + for result in results: + print "{0:20} | {1:6}".format(result[0], result[1]) + print "-----------------------------" + + responseCodes = [200, 201] + + if (updateversion == 'false'): + responseCodes = [200, 201, 409] + + failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) + if (len(failedNormatives) > 0): + errorAndExit(1, None) + else: + errorAndExit(0, None) + + +if __name__ == "__main__": + main(sys.argv[1:]) + diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py index 21a477503c..5c57762c61 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py @@ -11,7 +11,9 @@ from importPolicyTypes import importPolicyTypes from importGroupTypes import importGroupTypes from importNormativeCapabilities import importNormativeCapabilities from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType +from upgradeNfvTypes import upgradeNfvTypesPerConfigFile from upgradeONAPTypes import upgradeOnapTypesPerConfigFile +from upgradeSolTypes import upgradeSolTypesPerConfigFile from importCommon import * @@ -119,10 +121,16 @@ def main(argv): resultsHeat = upgradeTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateversion) handleResults(resultsHeat) - + + resultsHeat = upgradeNfvTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion) + handleResults(resultsHeat) + resultsHeat = upgradeOnapTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion) handleResults(resultsHeat) - + + resultsHeat = upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion) + handleResults(resultsHeat) + errorAndExit(0, None) if __name__ == "__main__": diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py new file mode 100644 index 0000000000..25d9b4d1fc --- /dev/null +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py @@ -0,0 +1,104 @@ +import pycurl +import sys, getopt +from StringIO import StringIO +import json +import copy +from importCommon import * +from importNormativeTypes import * +import importCommon +import json + + +################################################################################################################################################################################################ +# # +# Upgrades all Heat and Normative types confiugred in "typesToUpgrade.json" file # +# # +# activation # +# python upgradeHeatAndNormativeTypes.py [-s | --scheme= ] [-i | --ip=] [-p | --port= ] [-f | --ifile= ] # +# # +# shortest activation (be host = localhost, be port = 8080): # +# python upgradeHeatAndNormativeTypes.py [-f | --ifile= ] # +# # +################################################################################################################################################################################################ +def upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseDir, updateversion): + responseCodes = [200, 201] + if (updateversion == 'false'): + responseCodes = [200, 201, 409] + with open("onapTypesToUpgrade.json", 'r') as stream: + try: + types = json.load(stream) + solTypes = types["sol"] + debug(solTypes) + solFileDir = baseDir + "sol-types/" + debug(solFileDir) + results = [] + for solType in solTypes: + result = createNormativeType(scheme, beHost, bePort, adminUser, solFileDir, solType.encode('ascii', 'ignore'), updateversion) + results.append(result) + if (result[1] == None or result[1] not in responseCodes): + print "Failed creating sol type " + solType + ". " + str(result[1]) + except yaml.YAMLError as exc: + print(exc) + + + +def main(argv): + print 'Number of arguments:', len(sys.argv), 'arguments.' + + beHost = 'localhost' + bePort = '8080' + adminUser = 'jh0003' + updateversion = 'true' + scheme = 'http' + + try: + opts, args = getopt.getopt(argv, "i:p:u:v:h:s:", ["ip=", "port=", "user=", "updateversion=","scheme="]) + except getopt.GetoptError: + usage() + errorAndExit(2, 'Invalid input') + + for opt, arg in opts: + # print opt, arg + if opt == '-h': + usage() + sys.exit(3) + elif opt in ("-i", "--ip"): + beHost = arg + elif opt in ("-p", "--port"): + bePort = arg + elif opt in ("-u", "--user"): + adminUser = arg + elif opt in ("-s", "--scheme"): + scheme = arg + elif opt in ("-v", "--updateversion"): + if (arg.lower() == "false" or arg.lower() == "no"): + updateversion = 'false' + + print 'scheme =',scheme,', be host =',beHost, ', be port =', bePort, ', user =', adminUser + + if (beHost == None): + usage() + sys.exit(3) + + results = upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, "../../../import/tosca/", updateversion) + + print "-----------------------------" + for result in results: + print "{0:20} | {1:6}".format(result[0], result[1]) + print "-----------------------------" + + responseCodes = [200, 201] + + if (updateversion == 'false'): + responseCodes = [200, 201, 409] + + failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) + if (len(failedNormatives) > 0): + errorAndExit(1, None) + else: + errorAndExit(0, None) + + +if __name__ == "__main__": + main(sys.argv[1:]) + -- cgit 1.2.3-korg