R2 model updates

[sdc.git] / common / onap-tosca-datatype / src / main / resources / globalTypes / onap / capabilities.yml

diff --git a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
index 3a7104f..e37169b 100644 (file)
--- a/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
+++ b/common/onap-tosca-datatype/src/main/resources/globalTypes/onap/capabilities.yml
@@ -33,18 +33,29 @@ capability_types:
   tosca.capabilities.nfv.VirtualBindable:
     derived_from: tosca.capabilities.Root
 
+  tosca.capabilities.nfv.ExtVirtualLinkable:
+    derived_from: tosca.capabilities.Root
+
   tosca.capabilities.nfv.VirtualCompute:
     derived_from: tosca.capabilities.Root
     properties:
-      virtual_memory:
-        type: tosca.datatypes.nfv.VirtualMemory
+      logical_node:
+        type: tosca.datatypes.nfv.LogicalNodeData
+        required: false
+        #compute_requirements: Type is TBD
+        #type: map
+        #required: false
       requested_additional_capabilities:
+        type: map
         entry_schema:
-          type: tosca.datatypes.nfv.RequestedAdditionalCapability
+           type: tosca.datatypes.nfv.RequestedAdditionalCapability
         required: false
-        type: map
+      virtual_memory:
+        type: tosca.datatypes.nfv.VirtualMemory
+        required: true
       virtual_cpu:
         type: tosca.datatypes.nfv.VirtualCpu
+        required: true
 
   tosca.capabilities.nfv.VirtualStorage:
     derived_from: tosca.capabilities.Root