diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml | 244 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip | bin | 1128 -> 1081 bytes | |||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip | bin | 1181 -> 1164 bytes | |||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml | 3 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip | bin | 658 -> 636 bytes | |||
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py | 7 |
8 files changed, 133 insertions, 125 deletions
diff --git a/.gitignore b/.gitignore index e38db8cb2b..26ba10439c 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,5 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* /common/openecomp-common-configuration-management/openecomp-configuration-management-cli/dependency-reduced-pom.xml + +/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/* 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 index 958806a097..51a8ce539e 100644 --- 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 @@ -17,126 +17,126 @@ metadata: node_types: - # ***************************************************************************** - # Overlay tunnel service - # ***************************************************************************** + # ***************************************************************************** + # 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 + 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 Binary files differindex e60fcbc0a6..9340f06ca7 100644 --- 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 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 Binary files differindex 4a0bce00f7..65bc805bb7 100644 --- 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 diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json index 6a565dc3b8..955e5e3e30 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteCP/extZteCP.json @@ -11,5 +11,5 @@ "name": "Network Elements" }] }], - "tags": ["Ext ZTE CP"] + "tags": ["ext ZTE CP"] }
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml index 5cd45b74e3..1638305021 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.yml @@ -1,5 +1,6 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: +node_types: + tosca.nodes.nfv.ext.zte.VDU: derived_from: tosca.nodes.Root properties: manual_scale_select_vim: diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip Binary files differindex a7ad624422..2bf0f54ea3 100644 --- a/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip +++ b/catalog-be/src/main/resources/import/tosca/onap-types/extZteVDU/extZteVDU.zip 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 44b63a795b..f91b64ed81 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -21,7 +21,12 @@ import importCommon def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): - onapTypes = [ "vduCompute", + onapTypes = [ "extImageFile", + "extLocalStorage", + "extZteCP", + "extZteVDU", + "extZteVL", + "vduCompute", "vduCpd", "vduVirtualStorage", "vnfVirtualLinkDesc" |