Merge feature/new-cord-repo branch
diff --git a/xos/configurations/cord-pod/make-vtn-external-yaml.sh b/xos/configurations/cord-pod/make-vtn-external-yaml.sh
index a7f04c1..9be5f4a 100644
--- a/xos/configurations/cord-pod/make-vtn-external-yaml.sh
+++ b/xos/configurations/cord-pod/make-vtn-external-yaml.sh
@@ -104,6 +104,7 @@
node: service#vtn
relationship: tosca.relationships.UsedByService
properties:
- dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp, org.onosproject.cordvtn, org.onosproject.olt, org.onosproject.igmp, org.onosproject.cordmcast
+ install_dependencies: http://maven.opencord.org/config/config.oar,http://maven.opencord.org/vtn/vtn.oar
+ dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp, org.opencord.vtn, org.opencord.olt, org.opencord.igmp, org.opencord.mcast
autogenerate: vtn-network-cfg
EOF
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosapp.py b/xos/onboard/onos/synchronizer/steps/sync_onosapp.py
index 78a8cc8..41cfd22 100644
--- a/xos/onboard/onos/synchronizer/steps/sync_onosapp.py
+++ b/xos/onboard/onos/synchronizer/steps/sync_onosapp.py
@@ -178,7 +178,7 @@
data = {
"apps" : {
- "org.onosproject.cordvtn" : {
+ "org.opencord.vtn" : {
"cordvtn" : {
"privateGatewayMac" : privateGatewayMac,
"localManagementIp": localManagementIp,
@@ -226,7 +226,7 @@
"dataPlaneIntf": dataPlaneIntf,
"dataPlaneIp": dataPlaneIp
}
- data["apps"]["org.onosproject.cordvtn"]["cordvtn"]["nodes"].append(node_dict)
+ data["apps"]["org.opencord.vtn"]["cordvtn"]["nodes"].append(node_dict)
# Generate apps->org.onosproject.cordvtn->cordvtn->publicGateways
# Pull the gateway information from vRouter
@@ -239,7 +239,7 @@
"gatewayIp": gatewayIp,
"gatewayMac": gatewayMac
}
- data["apps"]["org.onosproject.cordvtn"]["cordvtn"]["publicGateways"].append(gateway_dict)
+ data["apps"]["org.oopencord.vtn"]["cordvtn"]["publicGateways"].append(gateway_dict)
return json.dumps(data, indent=4, sort_keys=True)
@@ -399,6 +399,8 @@
file(os.path.join(o.files_dir, fn),"w").write(" " +value)
o.early_rest_configs.append( {"endpoint": endpoint, "fn": fn} )
+
+
# Generate config files and save them to the appropriate tenant attributes
configs = []
for key, value in attrs.iteritems():
@@ -491,6 +493,11 @@
else:
fields["dependencies"] = []
+ if o.install_dependencies:
+ fields["install_dependencies"] = [x.strip() for x in o.install_dependencies.split(",")]
+ else:
+ fields["install_dependencies"] = []
+
return fields
def get_extra_attributes_full(self, o):
@@ -503,11 +510,6 @@
fields["component_configs"] = o.component_configs
fields["node_key_fn"] = o.node_key_fn
- if o.install_dependencies:
- fields["install_dependencies"] = [x.strip() for x in o.install_dependencies.split(",")]
- else:
- fields["install_dependencies"] = []
-
if (instance.isolation=="container"):
fields["ONOS_container"] = "%s-%s" % (instance.slice.name, str(instance.id))
else:
diff --git a/xos/onboard/onos/synchronizer/steps/sync_onosapp_nocontainer.yaml b/xos/onboard/onos/synchronizer/steps/sync_onosapp_nocontainer.yaml
index 5aad569..c868d68 100644
--- a/xos/onboard/onos/synchronizer/steps/sync_onosapp_nocontainer.yaml
+++ b/xos/onboard/onos/synchronizer/steps/sync_onosapp_nocontainer.yaml
@@ -18,17 +18,29 @@
body: "{{ '{{' }} lookup('file', '{{ files_dir }}/{{ rest_config.fn }}') {{ '}}' }}"
{% endfor %}
{% endif %}
-{% if early_rest_configs %}
- early_rest_configs:
-{% for early_rest_config in early_rest_configs %}
- - endpoint: {{ early_rest_config.endpoint }}
- body: "{{ '{{' }} lookup('file', '{{ files_dir }}/{{ early_rest_config.fn }}') {{ '}}' }}"
+{% if install_dependencies %}
+ install_dependencies:
+{% for install_dependency in install_dependencies %}
+ - endpoint: "onos/v1/applications"
+ body: '{"url" : "{{ install_dependency }}", "activate" : "false" }'
{% endfor %}
{% endif %}
rest_hostname: {{ rest_hostname }}
rest_port: {{ rest_port }}
tasks:
+{% if install_dependencies %}
+ - name: Install ONOS apps by URL
+ uri:
+ url: http://{{ '{{' }} rest_hostname {{ '}}' }}:{{ '{{' }} rest_port {{ '}}' }}/{{ '{{' }} item.endpoint {{ '}}' }} #http://localhost:8181/onos/v1/network/configuration/
+ body: "{{ '{{' }} item.body {{ '}}' }}"
+ body_format: raw
+ method: POST
+ user: karaf
+ password: karaf
+ with_items: "install_dependencies"
+{% endif %}
+
{% if dependencies %}
- name: Add dependencies to ONOS
uri:
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 04d7641..86befbf 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -250,6 +250,9 @@
dependencies:
type: string
required: false
+ install_dependencies:
+ type: string
+ required: false
rest_onos/v1/network/configuration/:
type: string
required: false
@@ -266,6 +269,9 @@
dependencies:
type: string
required: false
+ install_dependencies:
+ type: string
+ required: false
rest_onos/v1/network/configuration/:
type: string
required: false
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index e52c0e1..d467c72 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -456,6 +456,9 @@
dependencies:
type: string
required: false
+ install_dependencies:
+ type: string
+ required: false
rest_onos/v1/network/configuration/:
type: string
required: false
@@ -479,6 +482,9 @@
dependencies:
type: string
required: false
+ install_dependencies:
+ type: string
+ required: false
rest_onos/v1/network/configuration/:
type: string
required: false