Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

3 files changed, 29 insertions, 0 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json
new file mode 100644
index 0000000000..ff55d80135
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json
@@ -0,0 +1,21 @@
+{
+  "payloadName": "extCP.yml",
+  "contactId": "DS200P",
+  "name": "ExtCP2",
+  "description": "The AT&T Connection Point base type all other CP derive from",
+  "resourceIconPath": "network",
+  "resourceType": "CP",
+  "categories": [
+  {
+    "name": "Generic",
+    "subcategories": [
+     {
+        "name": "Network Elements"
+      }
+    ]
+  }
+],  
+ "tags": [
+    "ExtCP2"
+  ]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml
new file mode 100644
index 0000000000..beae41d5ca
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml
@@ -0,0 +1,8 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+  org.openecomp.resource.cp.v2.extCP:
+    derived_from: org.openecomp.resource.cp.nodes.network.Port  
+    description: The SDC External Connection Point base type 
+    capabilities:
+      port_mirroring:
+        type: org.openecomp.capabilities.PortMirroring
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip
new file mode 100644
index 0000000000..81a9259e6d
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip