MCORD + UI final merge
diff --git a/xos/configurations/mcord/mcord.yaml b/xos/configurations/mcord/mcord.yaml
index ef0c2c5..971e7a9 100644
--- a/xos/configurations/mcord/mcord.yaml
+++ b/xos/configurations/mcord/mcord.yaml
@@ -139,7 +139,7 @@
node: External
relationship: tosca.relationships.UsesNetworkTemplate
- owner:
- node: mysite_vbbu_slice1
+ node: mysite_mobile_net
relationship: tosca.relationships.MemberOfSlice
- connection:
node: mysite_vbbu_slice1
@@ -159,7 +159,7 @@
node: External
relationship: tosca.relationships.UsesNetworkTemplate
- owner:
- node: mysite_vbbu_slice1
+ node: mysite_mobile_net
relationship: tosca.relationships.MemberOfSlice
- connection:
node: mysite_vbbu_slice1
@@ -179,7 +179,7 @@
node: External
relationship: tosca.relationships.UsesNetworkTemplate
- owner:
- node: mysite_vbbu_slice1
+ node: mysite_mobile_net
relationship: tosca.relationships.MemberOfSlice
- connection:
node: mysite_vbbu_slice1
@@ -201,6 +201,16 @@
node: mysite
relationship: tosca.relationships.MemberOfSite
+ mysite_mobile_net:
+ description: This slice exists solely to own the mobile network
+ type: tosca.nodes.Slice
+ properties:
+ network: noauto
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
+
mysite_vbbu_slice1:
description: MCORD Service Slice 1
type: tosca.nodes.Slice
diff --git a/xos/synchronizers/vbbu/steps/sync_vbbu.py b/xos/synchronizers/vbbu/steps/sync_vbbu.py
index 59feb33..09b1fe8 100644
--- a/xos/synchronizers/vbbu/steps/sync_vbbu.py
+++ b/xos/synchronizers/vbbu/steps/sync_vbbu.py
@@ -34,4 +34,4 @@
return objs
def get_extra_attributes(self, o):
- return {"display_message": o.display_message}
+ return {"display_message": o.display_message, "s1u_tag": o.s1u_tag, "s1mme_tag": o.s1mme_tag, "rru_tag": o.rru_tag}
diff --git a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml
index 2d9bf39..344b9de 100644
--- a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml
+++ b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml
@@ -9,3 +9,12 @@
- name: write message
shell: echo "{{ display_message }}" > /var/tmp/index.html
+ - name: setup s1u interface config
+ shell: ./start_3gpp_int.sh eth1 {{ s1u_tag }} {{ s1u_ip }}/24
+
+ - name: setup s1mme interface config
+ shell: ./start_3gpp_int.sh eth2 {{ s1mme_tag }} {{ s1mme_ip }}/24
+
+ - name: setup rru interface config
+ shell: ./start_3gpp_int.sh eth3 {{ rru_tag }} {{ rru_ip }}/24
+
diff --git a/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old
new file mode 100644
index 0000000..4b392ae
--- /dev/null
+++ b/xos/synchronizers/vbbu/steps/sync_vbbu.yaml.old
@@ -0,0 +1,14 @@
+---
+- hosts: {{ instance_name }}
+ gather_facts: False
+ connection: ssh
+ user: ubuntu
+ sudo: yes
+ tasks:
+
+ - name: write message
+ shell: echo "{{ display_message }}" > /var/tmp/index.html
+
+ - name: setup s1u interface message
+ shell: ifconfig eth1 0.0.0.0; ip link add link eth1 name eth1.{{ s1u_tag }} type vlan id {{ s1u_tag }}; ip a a {{ s1u_ip }}/24 dev eth1.{{ s1u_tag }}; ifconfig eth1 up; ifconfig eth1.{{ s1u_tag }} up
+