6 files changed, 1 insertions, 16 deletions
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
index 541126f7e3..68ecf90104 100644
--- 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
@@ -3,19 +3,9 @@ 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
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
index 9010bf0544..32487dc65c 100644
--- 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
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
index cf7b5cc490..00d3bd243d 100644
--- 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
@@ -34,4 +34,5 @@ node_types:
     - 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
index 1417651d5f..fd3f7e9d79 100644
--- 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
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml
index 1c461681a2..6924a28901 100644
--- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml
+++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml
@@ -1,4 +1,3 @@
-#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!!
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 node_types:
     tosca.nodes.nfv.VduCp:
@@ -23,11 +22,6 @@ node_types:
           entry_schema:
             type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
           required: false
-       # order:      #there is no this attribute in IM.
-       #   type: integer
-       #   required: false
-       #   constraints:
-       #     - greater_or_equal: 0
       requirements:
         - virtual_link:
             capability: tosca.capabilities.nfv.VirtualLinkable
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
index c5a43abf5b..4da5c12ad2 100644
--- 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