Requirement and capabilities feature

1. Enhance Service/VF/PNF to support Req & Cap
2. Added Type fetch APIs to fetch types from global types

Change-Id: I2b749ec9da34e488421b8ebe311ccf03c4b7c0fd
Issue-ID: SDC-2142
Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>

1 files changed, 30 insertions, 29 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
index 4506fa1b97..f446f21a62 100644
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
@@ -15,18 +15,22 @@ tosca.relationships.Root:
     Configure:
       type: tosca.interfaces.relationship.Configure        
 
+tosca.relationships.ConnectsTo:
+  derived_from: tosca.relationships.Root
+  description: This type represents a network connection relationship between two nodes.
+  valid_target_types:
+  - tosca.capabilities.Endpoint
+  properties:
+    credential:
+      type: tosca.datatypes.Credential
+      required: false
+
 tosca.relationships.RoutesTo:
   derived_from: tosca.relationships.ConnectsTo
   description: This type represents an intentional network routing between two Endpoints in different networks.
   valid_target_types:
   - tosca.capabilities.Endpoint
 
-tosca.relationships.network.LinksTo:
-  derived_from: tosca.relationships.DependsOn
-  description: This relationship type represents an association relationship between Port and Network node types.
-  valid_target_types:
-  - tosca.capabilities.network.Linkable
-
 tosca.relationships.AttachesTo:
   derived_from: tosca.relationships.Root
   description: This type represents an attachment relationship between two nodes. For example, an AttachesTo relationship type would be used for attaching a storage node to a Compute node.
@@ -52,12 +56,6 @@ tosca.relationships.AttachesTo:
         orchestrator.'
       type: string
 
-tosca.relationships.network.BindsTo:
-  derived_from: tosca.relationships.DependsOn
-  description: This type represents a network association relationship between Port and Compute node types.
-  valid_target_types:
-  - tosca.capabilities.network.Bindable
-
 tosca.relationships.HostedOn:
   derived_from: tosca.relationships.Root
   description: This type represents a hosting relationship between two nodes.
@@ -70,15 +68,27 @@ tosca.relationships.DependsOn:
   valid_target_types:
   - tosca.capabilities.Node
 
-tosca.relationships.ConnectsTo:
-  derived_from: tosca.relationships.Root
-  description: This type represents a network connection relationship between two nodes.
+tosca.relationships.network.LinksTo:
+  derived_from: tosca.relationships.DependsOn
+  description: This relationship type represents an association relationship between Port and Network node types.
   valid_target_types:
-  - tosca.capabilities.Endpoint
-  properties:
-    credential:
-      type: tosca.datatypes.Credential
-      required: false
+  - tosca.capabilities.network.Linkable
+
+tosca.relationships.network.BindsTo:
+  derived_from: tosca.relationships.DependsOn
+  description: This type represents a network association relationship between Port and Compute node types.
+  valid_target_types:
+  - tosca.capabilities.network.Bindable
+
+org.openecomp.relationships.AttachesTo:
+    derived_from: tosca.relationships.AttachesTo
+    description: This type represents an attachment relationship
+    properties:
+      location:
+        description: The relative location (e.g., path on the file system), which provides the root location to address an attached node.
+        type: string
+        status: SUPPORTED
+        required: false
 
 org.openecomp.relationships.VolumeAttachesTo:
   derived_from: org.openecomp.relationships.AttachesTo
@@ -100,15 +110,6 @@ org.openecomp.relationships.VolumeAttachesTo:
       type: string
       status: SUPPORTED
 
-org.openecomp.relationships.AttachesTo:
-    derived_from: tosca.relationships.AttachesTo
-    description: This type represents an attachment relationship
-    properties:
-      location:
-        description: The relative location (e.g., path on the file system), which provides the root location to address an attached node.
-        type: string
-        status: SUPPORTED
-        required: false
 org.openecomp.relationships.ForwardsTo:
   derived_from: tosca.relationships.Root
   valid_target_types: [org.openecomp.capabilities.Forwarder]