aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2018-08-16 16:27:12 +0300
committerMichael Lando <ml636r@att.com>2018-08-20 02:51:19 +0000
commit3e7c13579da7ff25b308cb577efdd04fd7ca9696 (patch)
treeec73d5cfecd514d2b31e09aa8ae3eff91ecfb5e1
parent61919ec216756da63bd43983c3f522b402de4cb6 (diff)
Import normative improvement
Change-Id: I6db32d8107874b2454b75348d909b295030a556f Issue-ID: SDC-557 Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
-rw-r--r--catalog-be/src/main/resources/import/tosca/annotation-types/annotationTypes.zipbin333 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zipbin969 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zipbin1797 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zipbin1119 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zipbin7401 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zipbin1305 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zipbin314 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_PNF/Generic_PNF.zipbin320 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zipbin252 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zipbin462 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.zipbin577 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zipbin390 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zipbin381 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zipbin369 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zipbin362 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zipbin1186 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zipbin405 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zipbin897 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zipbin663 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zipbin552 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.zipbin727 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.zipbin638 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.zipbin746 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zipbin756 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zipbin745 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zipbin627 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.zipbin833 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zipbin321 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zipbin665 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extCp/extCp.zipbin780 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json2
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zipbin347 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zipbin1201 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zipbin737 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zipbin767 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zipbin359 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zipbin509 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zipbin1999 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalNetwork/globalNetwork.zipbin353 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zipbin1258 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/internalVl/internalVl.zipbin284 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zipbin358 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zipbin843 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zipbin1172 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zipbin1383 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zipbin366 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zipbin532 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zipbin566 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zipbin239 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zipbin254 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zipbin1010 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/vl/vl.zipbin355 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zipbin404 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/volume/volume.zipbin308 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zipbin579 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zipbin598 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.zipbin554 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zipbin318 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zipbin758 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zipbin608 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.zipbin377 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.zipbin350 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.zipbin586 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.zipbin636 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.zipbin529 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.zipbin611 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.zipbin1081 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.zipbin1164 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zipbin881 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zipbin576 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zipbin523 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zipbin526 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zipbin478 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/DBMS/DBMS.zipbin382 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/blockStorage/blockStorage.zipbin352 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/compute/compute.zipbin519 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/containerApplication/containerApplication.zipbin318 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/containerRuntime/containerRuntime.zipbin295 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/database/database.zipbin477 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zipbin458 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/network/network.zipbin463 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/objectStorage/objectStorage.zipbin346 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/port/port.zipbin414 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/root/root.zipbin417 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/softwareComponent/softwareComponent.zipbin395 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/webApplication/webApplication.zipbin358 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/normative-types/webServer/webServer.zipbin340 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zipbin885 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zipbin1484 -> 0 bytes
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py2
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py100
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py121
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py13
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py8
94 files changed, 18 insertions, 228 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/annotation-types/annotationTypes.zip b/catalog-be/src/main/resources/import/tosca/annotation-types/annotationTypes.zip
deleted file mode 100644
index 5783c9794a..0000000000
--- a/catalog-be/src/main/resources/import/tosca/annotation-types/annotationTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip b/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip
deleted file mode 100644
index 3f623fc972..0000000000
--- a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip
deleted file mode 100644
index de4aa48a1d..0000000000
--- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip
deleted file mode 100644
index 2fc617983c..0000000000
--- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
deleted file mode 100644
index 1c6ad9013e..0000000000
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip
deleted file mode 100644
index d7dd67c205..0000000000
--- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip
deleted file mode 100644
index 092393278d..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_PNF/Generic_PNF.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_PNF/Generic_PNF.zip
deleted file mode 100644
index fc5d706514..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_PNF/Generic_PNF.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip
deleted file mode 100644
index e5bcd325d2..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip
deleted file mode 100644
index d20e69e8d6..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.zip
deleted file mode 100644
index f98f53333a..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VFC/Generic_VFC.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip
deleted file mode 100644
index cb99fae722..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zip
deleted file mode 100644
index fa6312e7f6..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zip
deleted file mode 100644
index 23287d625c..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip
deleted file mode 100644
index 48d1908b8a..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip
deleted file mode 100644
index be5bf9d01f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip
deleted file mode 100644
index e63971c0ed..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip
deleted file mode 100644
index 4486fe44e4..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip
deleted file mode 100644
index 06fb34db51..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip
deleted file mode 100644
index 633f7c7659..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.zip
deleted file mode 100644
index 6040f3cb17..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.zip
deleted file mode 100644
index a8a84e7eff..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.zip
deleted file mode 100644
index eadba5ef28..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterface/contrailV2VLANSubInterface.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zip
deleted file mode 100644
index cc65bf9f53..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip
deleted file mode 100644
index 054af8b190..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip
deleted file mode 100644
index ab6f90eb1f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.zip
deleted file mode 100644
index 56d38c5272..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip b/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip
deleted file mode 100644
index ea770f5042..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip
deleted file mode 100644
index dddadde1ad..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp/extCp.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extCp/extCp.zip
deleted file mode 100644
index 5e18a2474a..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extCp/extCp.zip
+++ /dev/null
Binary files differ
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
index ff55d80135..c3f3f501b1 100644
--- 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
@@ -1,5 +1,5 @@
{
- "payloadName": "extCP.yml",
+ "payloadName": "extCP2.yml",
"contactId": "DS200P",
"name": "ExtCP2",
"description": "The AT&T Connection Point base type all other CP derive from",
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
deleted file mode 100644
index 81a9259e6d..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip
deleted file mode 100644
index 8a790a546f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zip
deleted file mode 100644
index 4edd5b3314..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip
deleted file mode 100644
index 48ebb1f610..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zip
deleted file mode 100644
index 15088d9091..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zip b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zip
deleted file mode 100644
index 7135677bf1..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip
deleted file mode 100644
index a04df59514..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalNetwork/globalNetwork.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalNetwork/globalNetwork.zip
deleted file mode 100644
index ddf8640b5b..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalNetwork/globalNetwork.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip
deleted file mode 100644
index f54d7d2c1b..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/internalVl/internalVl.zip b/catalog-be/src/main/resources/import/tosca/heat-types/internalVl/internalVl.zip
deleted file mode 100644
index 2a96bc3d9f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/internalVl/internalVl.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip b/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip
deleted file mode 100644
index 9edb9f53c0..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip
deleted file mode 100644
index c85c133155..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip
deleted file mode 100644
index 884dae17e1..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip
deleted file mode 100644
index 1adb0ded4c..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip
deleted file mode 100644
index ca5650b8c9..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip
deleted file mode 100644
index 7a4ce51cfb..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip
deleted file mode 100644
index 94bcddfa19..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip
deleted file mode 100644
index 55ffe94d99..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip
deleted file mode 100644
index 51bfe51d32..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zip b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zip
deleted file mode 100644
index fc34ec54ff..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/vl/vl.zip b/catalog-be/src/main/resources/import/tosca/heat-types/vl/vl.zip
deleted file mode 100644
index 554c88d925..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/vl/vl.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip
deleted file mode 100644
index eb763dadf4..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/volume/volume.zip b/catalog-be/src/main/resources/import/tosca/heat-types/volume/volume.zip
deleted file mode 100644
index c5847d41df..0000000000
--- a/catalog-be/src/main/resources/import/tosca/heat-types/volume/volume.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip
deleted file mode 100644
index e18013a719..0000000000
--- a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip
deleted file mode 100644
index ac7e5e83a8..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index d741b50c16..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/NSD/NSD.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 32487dc65c..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip
deleted file mode 100644
index 1c3b7a8b4f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index fd3f7e9d79..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index acee384754..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/extImageFile/extImageFile.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index b3bcc91c90..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/extLocalStorage/extLocalStorage.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index ca6d0738de..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteCP/extZteCP.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 2bf0f54ea3..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVDU/extZteVDU.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 5f04404f25..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/extZteVL/extZteVL.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index ed51f834f3..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/genericNeutronNet/genericNeutronNet.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 9340f06ca7..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/overlayTunnel/overlayTunnel.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 65bc805bb7..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/underlayVpn/underlayVpn.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index e8d3d303be..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip
deleted file mode 100644
index 4da5c12ad2..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 49849c9f28..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip
deleted file mode 100644
index 1860e64639..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 3d29909033..0000000000
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLinkDesc/vnfVirtualLinkDesc.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/DBMS/DBMS.zip b/catalog-be/src/main/resources/import/tosca/normative-types/DBMS/DBMS.zip
deleted file mode 100644
index 7f88b3ba53..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/DBMS/DBMS.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/blockStorage/blockStorage.zip b/catalog-be/src/main/resources/import/tosca/normative-types/blockStorage/blockStorage.zip
deleted file mode 100644
index b26f9e2c0e..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/blockStorage/blockStorage.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/compute/compute.zip b/catalog-be/src/main/resources/import/tosca/normative-types/compute/compute.zip
deleted file mode 100644
index 6c008e866f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/compute/compute.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/containerApplication/containerApplication.zip b/catalog-be/src/main/resources/import/tosca/normative-types/containerApplication/containerApplication.zip
deleted file mode 100644
index cec3e5df6c..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/containerApplication/containerApplication.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/containerRuntime/containerRuntime.zip b/catalog-be/src/main/resources/import/tosca/normative-types/containerRuntime/containerRuntime.zip
deleted file mode 100644
index c30aff4098..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/containerRuntime/containerRuntime.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/database/database.zip b/catalog-be/src/main/resources/import/tosca/normative-types/database/database.zip
deleted file mode 100644
index 289e7e5ec1..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/database/database.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip b/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip
deleted file mode 100644
index dc57864564..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/network/network.zip b/catalog-be/src/main/resources/import/tosca/normative-types/network/network.zip
deleted file mode 100644
index 61788a9e39..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/network/network.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/objectStorage/objectStorage.zip b/catalog-be/src/main/resources/import/tosca/normative-types/objectStorage/objectStorage.zip
deleted file mode 100644
index 6b15346064..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/objectStorage/objectStorage.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/port/port.zip b/catalog-be/src/main/resources/import/tosca/normative-types/port/port.zip
deleted file mode 100644
index 0bf97333ce..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/port/port.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/root/root.zip b/catalog-be/src/main/resources/import/tosca/normative-types/root/root.zip
deleted file mode 100644
index b336a9dca3..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/root/root.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/softwareComponent/softwareComponent.zip b/catalog-be/src/main/resources/import/tosca/normative-types/softwareComponent/softwareComponent.zip
deleted file mode 100644
index f77816b83f..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/softwareComponent/softwareComponent.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/webApplication/webApplication.zip b/catalog-be/src/main/resources/import/tosca/normative-types/webApplication/webApplication.zip
deleted file mode 100644
index 0b1889bd8e..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/webApplication/webApplication.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/webServer/webServer.zip b/catalog-be/src/main/resources/import/tosca/normative-types/webServer/webServer.zip
deleted file mode 100644
index 45bee47eff..0000000000
--- a/catalog-be/src/main/resources/import/tosca/normative-types/webServer/webServer.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip
deleted file mode 100644
index f1a55ef046..0000000000
--- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip
deleted file mode 100644
index be7dcd0fbb..0000000000
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip
+++ /dev/null
Binary files differ
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
index 74ecf71784..7963588fdd 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
@@ -55,7 +55,7 @@ def importHeatTypes(scheme, beHost, bePort, adminUser, fileDir, updateversion):
"contrailV2VLANSubInterface",
"multiFlavorVFC",
"vnfConfiguration",
- "extCp2",
+ "extCP2",
"extNeutronCP",
"extContrailCP",
"portMirroringByPolicy",
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py
deleted file mode 100644
index 93394b3ed5..0000000000
--- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes1.py
+++ /dev/null
@@ -1,100 +0,0 @@
-import pycurl
-import sys, getopt
-from StringIO import StringIO
-import json
-import copy
-from importCommon import *
-from importNormativeTypes import *
-import importCommon
-
-#####################################################################################################################################################################################
-# #
-# Import heat types #
-# #
-# activation : #
-# python importHeatTypes1.py [-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-f <input file> | --ifile=<input file> ] #
-# #
-# shortest activation (be host = localhost, be port = 8080): #
-# python importHeatTypes1.py [-f <input file> | --ifile=<input file> ] #
-# #
-#####################################################################################################################################################################################
-
-def importHeatTypes1(scheme, beHost, bePort, adminUser, fileDir, updateversion):
-
- heatTypes = ["extCp"]
-
- responseCodes = [200, 201]
-
- if(updateversion == 'false'):
- responseCodes = [200, 201, 409]
-
- results = []
- for heatType in heatTypes:
- result = createNormativeType(scheme, beHost, bePort, adminUser, fileDir, heatType, updateversion)
- results.append(result)
- if ( result[1] == None or result[1] not in responseCodes) :
- print "Failed creating heat type " + heatType + ". " + 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:s:",["ip=","port=","user=","updateversion=","scheme="])
- except getopt.GetoptError:
- usage()
- error_and_exit(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 = importHeatTypes1(scheme, beHost, bePort, adminUser, "../../../import/tosca/heat-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):
- error_and_exit(1, None)
- else:
- error_and_exit(0, None)
-
-
-if __name__ == "__main__":
- main(sys.argv[1:])
-
-
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py
deleted file mode 100644
index 1dbd5fdcb3..0000000000
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll1.py
+++ /dev/null
@@ -1,121 +0,0 @@
-import pycurl
-import sys, getopt, os
-from StringIO import StringIO
-import json
-import copy
-import time
-#from importNormativeElements import createNormativeElement
-from importNormativeElements import *
-from importNormativeTypes import importNormativeTypes
-from importHeatTypes1 import importHeatTypes1
-from importNormativeCapabilities import importNormativeCapabilities
-from importCategoryTypes import importCategories
-from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
-from importDataTypes import importDataTypes
-from importGroupTypes import importGroupTypes
-from importPolicyTypes import importPolicyTypes
-from importCommon import *
-import importCommon
-
-#################################################################################################################################################################################################################################
-# #
-# Import all users from a given file #
-# #
-# activation : #
-# python importNormativeAll.py [-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] #
-# [-v <true|false> | --updateversion=<true|false>] #
-# #
-# shortest activation (be host = localhost, be port = 8080, user = jh0003): #
-# python importNormativeAll.py #
-# #
-#################################################################################################################################################################################################################################
-
-def usage():
- print sys.argv[0], '[optional -s <scheme> | --scheme=<scheme>, default http] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] [-v <true|false> | --updateversion=<true|false>]'
-
-def handleResults(results, updateversion):
- print_frame_line()
- for result in results:
- print_name_and_return_code(result[0], result[1])
- print_frame_line()
-
- responseCodes = [200, 201]
-
- if(updateversion == 'false'):
- responseCodes = [200, 201, 409]
-
- failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
- if (len(failedResults) > 0):
- error_and_exit(1, None)
-
-def main(argv):
- print 'Number of arguments:', len(sys.argv), 'arguments.'
-
- beHost = 'localhost'
- bePort = '8080'
- adminUser = 'jh0003'
- debugf = None
- updateversion = 'true'
- importCommon.debugFlag = False
- scheme = 'http'
-
- try:
- opts, args = getopt.getopt(argv,"i:p:u:d:v:h:s:",["ip=","port=","user=","debug=","updateversion=","scheme="])
- except getopt.GetoptError:
- usage()
- error_and_exit(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 ("-d", "--debug"):
- print arg
- debugf = bool(arg.lower() == "true" or arg.lower() == "yes")
- elif opt in ("-v", "--updateversion"):
- print arg
- if (arg.lower() == "false" or arg.lower() == "no"):
- updateversion = 'false'
-
- print 'scheme =',scheme,', be host =',beHost,', be port =', bePort,', user =', adminUser, ', debug =', debugf, ', updateversion =', updateversion
-
- if (debugf != None):
- print 'set debug mode to ' + str(debugf)
- importCommon.debugFlag = debugf
-
- if ( beHost == None ):
- usage()
- sys.exit(3)
-
- print sys.argv[0]
- pathdir = os.path.dirname(os.path.realpath(sys.argv[0]))
- debug("path dir =" + pathdir)
-
- baseFileLocation = pathdir + "/../../../import/tosca/"
-
- fileLocation = baseFileLocation + "data-types/"
- importDataTypes(scheme, beHost, bePort, adminUser, False, fileLocation)
-
- print 'sleep until data type cache is updated'
- time.sleep( 1 )
-
- fileLocation = baseFileLocation + "heat-types/"
- resultsHeat = importHeatTypes1(scheme, beHost, bePort, adminUser, fileLocation, updateversion)
- handleResults(resultsHeat, updateversion)
-
-
-
- error_and_exit(0, None)
-
-if __name__ == "__main__":
- main(sys.argv[1:])
-
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py
index 347898a815..453ee3aebc 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeElements.py
@@ -1,4 +1,5 @@
import pycurl
+import zipfile
from StringIO import StringIO
import json
import copy
@@ -47,7 +48,7 @@ def createNormativeElement(scheme, be_host, be_port, admin_user, file_dir, url_s
type_file_name = file_dir + "/" + element_name
- multi_part_form_data = create_multipart_form_data(element_form_name, type_file_name, with_metadata)
+ multi_part_form_data = create_multipart_form_data(element_form_name, type_file_name, with_metadata, element_name)
c.setopt(pycurl.HTTPPOST, multi_part_form_data)
c.setopt(c.WRITEFUNCTION, buffer.write)
@@ -69,8 +70,8 @@ def createNormativeElement(scheme, be_host, be_port, admin_user, file_dir, url_s
return (element_name, None, None)
-def create_multipart_form_data(element_form_name, type_file_name, with_metadata):
- tosca_type_zip_part = create_zip_file_multi_part(element_form_name, type_file_name)
+def create_multipart_form_data(element_form_name, type_file_name, with_metadata, element_name):
+ tosca_type_zip_part = create_zip_file_multi_part(element_form_name, type_file_name, element_name)
multi_part_form_data = [tosca_type_zip_part]
if with_metadata:
metadata_type_part = create_metadata_multipart(type_file_name)
@@ -84,7 +85,11 @@ def create_metadata_multipart(type_file_name):
return ("toscaTypeMetadata", metadata)
-def create_zip_file_multi_part(element_form_name, type_file_name):
+def create_zip_file_multi_part(element_form_name, type_file_name, element_name):
+ zf = zipfile.ZipFile(type_file_name + ".zip", "w")
+ zf.write(type_file_name + '.yml', element_name + '.yml')
+ zf.close()
+
tosca_type_zip_path = type_file_name + ".zip"
tosca_type_zip_part = (element_form_name, (pycurl.FORM_FILE, tosca_type_zip_path))
return tosca_type_zip_part
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 51d36586bc..511e8417e4 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeTypes.py
@@ -1,5 +1,6 @@
import pycurl
import sys, getopt
+import zipfile
from StringIO import StringIO
import json
import copy
@@ -37,8 +38,13 @@ def createNormativeType(scheme, beHost, bePort, adminUser, fileDir, ELEMENT_NAME
#c.setopt(pycurl.HTTPHEADER, ['Content-Type: application/json', 'Accept: application/json', adminHeader])
c.setopt(pycurl.HTTPHEADER, [adminHeader])
-
+ yml_path = fileDir + ELEMENT_NAME + "/" + ELEMENT_NAME + ".yml"
path = fileDir + ELEMENT_NAME + "/" + ELEMENT_NAME + ".zip"
+
+ zf = zipfile.ZipFile(path, "w")
+ zf.write(yml_path, ELEMENT_NAME + '.yml')
+ zf.close()
+
debug(path)
CURRENT_JSON_FILE=fileDir + ELEMENT_NAME + "/" + ELEMENT_NAME + ".json"
#sed -i 's/"userId": ".*",/"userId": "'${USER_ID}'",/' ${CURRENT_JSON_FILE}