Normative alignemet

Change-Id: I6115e20fe95662153903873d19439bc7cf0c2ff1
Issue-ID: SDC-1104
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>

9 files changed, 0 insertions, 403 deletions

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
--- a/catalog-be/src/main/resources/import/tosca/heat-types/genericNeutronNet/genericNeutronNet.zip
+++ /dev/null
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
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
+++ /dev/null
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
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
+++ /dev/null