tosca support for rest_hostname, rest_port, and no_container
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 20a537a..760e3c9 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -121,6 +121,15 @@
rest_onos/v1/network/configuration/:
type: string
required: false
+ rest_hostname:
+ type: string
+ required: false
+ rest_port:
+ type: string
+ required: false
+ no_container:
+ type: boolean
+ default: false
tosca.nodes.ONOSApp:
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 1b5db39..8135b7f 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -151,6 +151,15 @@
rest_onos/v1/network/configuration/:
type: string
required: false
+ rest_hostname:
+ type: string
+ required: false
+ rest_port:
+ type: string
+ required: false
+ no_container:
+ type: boolean
+ default: false
tosca.nodes.ONOSApp:
diff --git a/xos/tosca/resources/onosapp.py b/xos/tosca/resources/onosapp.py
index 5947400..321600d 100644
--- a/xos/tosca/resources/onosapp.py
+++ b/xos/tosca/resources/onosapp.py
@@ -57,7 +57,7 @@
v = d.value
if k.startswith("config_"):
self.set_tenant_attr(obj, k, v)
- elif k.startswith("rest_"):
+ elif k.startswith("rest_") and (k!="rest_hostname") and (k!="rest_port"):
self.set_tenant_attr(obj, k, v)
elif k.startswith("component_config"):
self.set_tenant_attr(obj, k, v)
diff --git a/xos/tosca/resources/onosservice.py b/xos/tosca/resources/onosservice.py
index b742ebb..c836a6c 100644
--- a/xos/tosca/resources/onosservice.py
+++ b/xos/tosca/resources/onosservice.py
@@ -13,7 +13,7 @@
class XOSONOSService(XOSService):
provides = "tosca.nodes.ONOSService"
xos_model = ONOSService
- copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber"]
+ copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber", "rest_hostname", "rest_port", "no_container"]
def set_service_attr(self, obj, prop_name, value):
value = self.try_intrinsic_function(value)
@@ -36,6 +36,6 @@
v = d.value
if k.startswith("config_"):
self.set_service_attr(obj, k, v)
- elif k.startswith("rest_"):
+ elif k.startswith("rest_") and (k!="rest_hostname") and (k!="rest_port"):
self.set_service_attr(obj, k, v)