Merge "Changend frontend config Vagrantfile to work with the repo introduced folder structure"
diff --git a/mcord/Makefile b/mcord/Makefile
index 2ce8584..7361750 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -55,20 +55,20 @@
sudo cp id_rsa key_import/vBBU_rsa
sudo cp id_rsa.pub key_import/vBBU_rsa.pub
- sudo cp id_rsa key_import/vPGW_rsa
- sudo cp id_rsa.pub key_import/vPGW_rsa.pub
+ sudo cp id_rsa key_import/vPGWC_rsa
+ sudo cp id_rsa.pub key_import/vPGWC_rsa.pub
sudo cp id_rsa key_import/onos_rsa
sudo cp id_rsa key_import/onos_rsa.pub
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/openstack/xos/openstack-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vBBU/xos/vBBU-onboard.yaml
- # $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vPGWC/xos/vPGWC-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vPGWC/xos/vPGWC-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtn/xos/vtn-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/onos-service/xos/onos-onboard.yaml
#$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/fabric/xos/\fabric-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) synchronizers.yaml
$(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
bash ../common/wait_for_onboarding_ready.sh 81 services/vbbu
- #bash ../common/wait_for_onboarding_ready.sh 81 services/vPGWC
+ bash ../common/wait_for_onboarding_ready.sh 81 services/vpgwc
bash ../common/wait_for_onboarding_ready.sh 81 services/vtn
bash ../common/wait_for_onboarding_ready.sh 81 services/onos
#bash ../common/wait_for_onboarding_ready.sh 81 services/fabric
diff --git a/mcord/mcord.yaml b/mcord/mcord.yaml
index 0af1a5f..765b0f6 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -120,11 +120,11 @@
properties:
kind: RAN
icon_url: /static/mCordServices/service_server.png
- view_url: /admin/mcord/vbbucomponent
+ view_url: /admin/vbbu/vbbucomponent
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
- private_key_fn: /opt/xos/services/vBBU/keys/vBBU_rsa
+ private_key_fn: /opt/xos/services/vbbu/keys/vBBU_rsa
artifacts:
- pubkey: /opt/xos/services/vBBU/keys/vBBU_rsa.pub
+ pubkey: /opt/xos/services/vbbu/keys/vBBU_rsa.pub
vPGWC:
type: tosca.nodes.MCORDService
@@ -132,11 +132,11 @@
properties:
kind: vEPC
icon_url: /static/mCordServices/service_server.png
- view_url: /admin/mcord/vpgwccomponent
+ view_url: /admin/vpgwc/vpgwccomponent
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
- private_key_fn: /opt/xos/configurations/mcord/mcord_private_key
+ private_key_fn: /opt/xos/services/vpgwc/keys/vPGWC_rsa
artifacts:
- pubkey: /opt/xos/configurations/mcord/mcord_public_key
+ pubkey: /opt/xos/services/vpgwc/keys/vPGWC_rsa.pub
m1.xlarge:
type: tosca.nodes.Flavor
@@ -315,7 +315,7 @@
properties:
network: noauto
default_node: compute10
-
+
mysite_VPGWC_Component:
description: MCORD Service default Component
type: tosca.nodes.VPGWCComponent
diff --git a/mcord/nodes.yaml b/mcord/nodes.yaml
index 432e779..592d34f 100644
--- a/mcord/nodes.yaml
+++ b/mcord/nodes.yaml
@@ -12,11 +12,41 @@
mysite:
type: tosca.nodes.Site
+ computeBBU1:
+ type: tosca.nodes.Node
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.MemberOfDeployment
+
computeBBU2:
type: tosca.nodes.Node
requirements:
- site:
- node: mysite
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.MemberOfDeployment
+
+ compute9:
+ type: tosca.nodes.Node
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.MemberOfSite
+ - deployment:
+ node: MyDeployment
+ relationship: tosca.relationships.MemberOfDeployment
+
+ compute10:
+ type: tosca.nodes.Node
+ requirements:
+ - site:
+ node: mysite
relationship: tosca.relationships.MemberOfSite
- deployment:
node: MyDeployment
@@ -31,14 +61,3 @@
- deployment:
node: MyDeployment
relationship: tosca.relationships.MemberOfDeployment
-
- compute10:
- type: tosca.nodes.Node
- requirements:
- - site:
- node: mysite
- relationship: tosca.relationships.MemberOfSite
- - deployment:
- node: MyDeployment
- relationship: tosca.relationships.MemberOfDeployment
-
diff --git a/mcord/vtn-external.yaml b/mcord/vtn-external.yaml
index d59e912..734b794 100644
--- a/mcord/vtn-external.yaml
+++ b/mcord/vtn-external.yaml
@@ -33,6 +33,51 @@
xosPassword: letmein
replaces: service_vtn
+ nova-compute-1:
+ type: tosca.nodes.Node
+
+ # VTN bridgeId field for node nova-compute-1
+ nova-compute-1_bridgeId_tag:
+ type: tosca.nodes.Tag
+ properties:
+ name: bridgeId
+ value: of:0000000000000001
+ requirements:
+ - target:
+ node: nova-compute-1
+ relationship: tosca.relationships.TagsObject
+ - service:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.MemberOfService
+
+ # VTN dataPlaneIntf field for node nova-compute-1
+ nova-compute-1_dataPlaneIntf_tag:
+ type: tosca.nodes.Tag
+ properties:
+ name: dataPlaneIntf
+ value: fabric
+ requirements:
+ - target:
+ node: nova-compute-1
+ relationship: tosca.relationships.TagsObject
+ - service:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.MemberOfService
+
+ # VTN dataPlaneIp field for node nova-compute-1
+ nova-compute-1_dataPlaneIp_tag:
+ type: tosca.nodes.Tag
+ properties:
+ name: dataPlaneIp
+ value: 10.168.0.253/24
+ requirements:
+ - target:
+ node: nova-compute-1
+ relationship: tosca.relationships.TagsObject
+ - service:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.MemberOfService
+
VTN_ONOS_app:
type: tosca.nodes.ONOSVTNApp
requirements:
diff --git a/mcord/xos.yaml b/mcord/xos.yaml
index 124c864..f157823 100644
--- a/mcord/xos.yaml
+++ b/mcord/xos.yaml
@@ -25,10 +25,10 @@
node: xos
relationship: tosca.relationships.UsedByXOS
- /opt/xos/xos_configuration/xos_cord_config:
+ /opt/xos/xos_configuration/xos_mcord_config:
type: tosca.nodes.XOSVolume
properties:
- host_path: { path_join: [ SELF, CONFIG_DIR, xos_cord_config, ENV_VAR ] }
+ host_path: { path_join: [ SELF, CONFIG_DIR, xos_mcord_config, ENV_VAR ] }
read_only: true
requirements:
- xos: