allow use of . in onos config file names
diff --git a/xos/configurations/cord/cord.yaml b/xos/configurations/cord/cord.yaml
index 3806ca7..47a33de 100644
--- a/xos/configurations/cord/cord.yaml
+++ b/xos/configurations/cord/cord.yaml
@@ -56,7 +56,7 @@
relationship: tosca.relationships.TenantOfService
properties:
dependencies: org.onosproject.proxyarp, org.onosproject.virtualbng, org.onosproject.openflow, org.onosproject.fwd
- config_addresses_json: >
+ config_addresses.json: >
{
"addresses" : [
{
@@ -74,7 +74,7 @@
}
]
}
- config_virtualbng_json: >
+ config_virtualbng.json: >
{
"localPublicIpPrefixes" : [
"10.254.0.128/25"
diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index e56f605..950ce02 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -493,7 +493,7 @@
KIND = "Provider"
class TenantAttribute(PlCoreBase):
- name = models.SlugField(help_text="Attribute Name", max_length=128)
+ name = models.CharField(help_text="Attribute Name", max_length=128)
value = models.TextField(help_text="Attribute Value")
tenant = models.ForeignKey(Tenant, related_name='tenantattributes', help_text="The Tenant this attribute is associated with")
diff --git a/xos/observers/onos/steps/sync_onosapp.py b/xos/observers/onos/steps/sync_onosapp.py
index 311fb93..8c97391 100644
--- a/xos/observers/onos/steps/sync_onosapp.py
+++ b/xos/observers/onos/steps/sync_onosapp.py
@@ -82,7 +82,7 @@
for attr in o.tenantattributes.all():
if attr.name.startswith("config_"):
- fn = attr.name[7:].replace("_json",".json")
+ fn = attr.name[7:] # .replace("_json",".json")
o.config_fns.append(fn)
file(os.path.join(o.files_dir, fn),"w").write(attr.value)
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 7487406..a673128 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -117,10 +117,10 @@
dependencies:
type: string
required: false
- config_addresses_json:
+ config_addresses.json:
type: string
required: false
- config_virtualbng_json:
+ config_virtualbng.json:
type: string
required: false
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 5ed5a80..38f1453 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -128,10 +128,10 @@
dependencies:
type: string
required: false
- config_addresses_json:
+ config_addresses.json:
type: string
required: false
- config_virtualbng_json:
+ config_virtualbng.json:
type: string
required: false
diff --git a/xos/tosca/samples/onos.yaml b/xos/tosca/samples/onos.yaml
index 17da61c..fc6a3d5 100644
--- a/xos/tosca/samples/onos.yaml
+++ b/xos/tosca/samples/onos.yaml
@@ -25,7 +25,7 @@
relationship: tosca.relationships.TenantOfService
properties:
dependencies: org.onosproject.proxyarp, org.onosproject.virtualbng, org.onosproject.openflow, org.onosproject.fwd
- config_addresses_json: >
+ config_addresses.json: >
{
"addresses" : [
{
@@ -43,7 +43,7 @@
}
]
}
- config_virtualbng_json: >
+ config_virtualbng.json: >
{
"localPublicIpPrefixes" : [
"200.0.0.0/32",