add xos_base_properties to more objects
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 81d1333..00805e7 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -12,7 +12,11 @@
no-create:
type: boolean
default: false
- description: Do not allow Tosca to create this object)
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object)
# Service
define(xos_base_service_caps,
scalable:
@@ -59,7 +63,7 @@
service_specific_id:
type: string
required: false
- description: Service specific ID, opaque to XOS but meaningful to service)
+ description: Service specific ID opaque to XOS but meaningful to service)
define(xos_base_tenant_props,
kind:
type: string
@@ -68,7 +72,7 @@
service_specific_id:
type: string
required: false
- description: Service specific ID, opaque to XOS but meaningful to service)
+ description: Service specific ID opaque to XOS but meaningful to service)
# end m4 macros
#
@@ -410,6 +414,7 @@
controller:
type: tosca.capabilities.xos.Controller
properties:
+ xos_base_props
backend_type:
type: string
required: false
@@ -447,29 +452,30 @@
site:
type: tosca.capabilities.xos.Site
properties:
- display_name:
- type: string
- required: false
- description: Name of the site.
- site_url:
- type: string
- required: false
- description: URL of site web page.
- enabled:
- type: boolean
- default: true
- hosts_nodes:
- type: boolean
- default: true
- description: If True, then this site hosts nodes where Instances may be instantiated.
- hosts_users:
- type: boolean
- default: true
- description: If True, then this site hosts users who may use XOS.
- is_public:
- type: boolean
- default: true
- # location, longitude, latitude
+ xos_base_props
+ display_name:
+ type: string
+ required: false
+ description: Name of the site.
+ site_url:
+ type: string
+ required: false
+ description: URL of site web page.
+ enabled:
+ type: boolean
+ default: true
+ hosts_nodes:
+ type: boolean
+ default: true
+ description: If True, then this site hosts nodes where Instances may be instantiated.
+ hosts_users:
+ type: boolean
+ default: true
+ description: If True, then this site hosts users who may use XOS.
+ is_public:
+ type: boolean
+ default: true
+ # location, longitude, latitude
tosca.nodes.Slice:
derived_from: tosca.nodes.Root
@@ -480,6 +486,7 @@
slice:
type: tosca.capabilities.xos.Slice
properties:
+ xos_base_props
enabled:
type: boolean
default: true
@@ -501,7 +508,9 @@
description: >
An XOS Node. Nodes are physical machines that host virtual machines
and/or containers.
- capability:
+ properties:
+ xos_base_props
+ capabilities:
node:
type: tosca.capabilities.xos.Node
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 9e25754..2a904c1 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -193,7 +193,7 @@
service_specific_id:
type: string
required: false
- description: Service specific ID
+ description: Service specific ID opaque to XOS but meaningful to service
tosca.nodes.CORDSubscriber:
derived_from: tosca.nodes.Root
@@ -212,7 +212,7 @@
service_specific_id:
type: string
required: false
- description: Service specific ID
+ description: Service specific ID opaque to XOS but meaningful to service
firewall_enable:
type: boolean
default: false
@@ -262,7 +262,7 @@
service_specific_id:
type: string
required: false
- description: Service specific ID
+ description: Service specific ID opaque to XOS but meaningful to service
vlan_id:
type: string
required: false
@@ -460,6 +460,10 @@
type: boolean
default: false
description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
accessControl:
type: string
default: allow all
@@ -499,6 +503,18 @@
controller:
type: tosca.capabilities.xos.Controller
properties:
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
backend_type:
type: string
required: false
@@ -536,29 +552,41 @@
site:
type: tosca.capabilities.xos.Site
properties:
- display_name:
- type: string
- required: false
- description: Name of the site.
- site_url:
- type: string
- required: false
- description: URL of site web page.
- enabled:
- type: boolean
- default: true
- hosts_nodes:
- type: boolean
- default: true
- description: If True, then this site hosts nodes where Instances may be instantiated.
- hosts_users:
- type: boolean
- default: true
- description: If True, then this site hosts users who may use XOS.
- is_public:
- type: boolean
- default: true
- # location, longitude, latitude
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
+ display_name:
+ type: string
+ required: false
+ description: Name of the site.
+ site_url:
+ type: string
+ required: false
+ description: URL of site web page.
+ enabled:
+ type: boolean
+ default: true
+ hosts_nodes:
+ type: boolean
+ default: true
+ description: If True, then this site hosts nodes where Instances may be instantiated.
+ hosts_users:
+ type: boolean
+ default: true
+ description: If True, then this site hosts users who may use XOS.
+ is_public:
+ type: boolean
+ default: true
+ # location, longitude, latitude
tosca.nodes.Slice:
derived_from: tosca.nodes.Root
@@ -569,6 +597,18 @@
slice:
type: tosca.capabilities.xos.Slice
properties:
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
enabled:
type: boolean
default: true
@@ -590,7 +630,20 @@
description: >
An XOS Node. Nodes are physical machines that host virtual machines
and/or containers.
- capability:
+ properties:
+ no-delete:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to delete this object
+ no-create:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to create this object
+ no-update:
+ type: boolean
+ default: false
+ description: Do not allow Tosca to update this object
+ capabilities:
node:
type: tosca.capabilities.xos.Node