onboarding vPGWC
Change-Id: Iffbe50e03de06b77da4eaf6b28a9b30cc57279c3
diff --git a/mcord/Makefile b/mcord/Makefile
index b2fc4da..7361750 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -61,14 +61,14 @@
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 335dfed..0486150 100644
--- a/mcord/mcord.yaml
+++ b/mcord/mcord.yaml
@@ -134,11 +134,11 @@
icon_url: /static/mCordServices/service_server.png
view_url: /admin/mcord/vpgwccomponent
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
- #private_key_fn: /opt/xos/services/vpgwc/keys/vPGWC_rsa
- private_key_fn: /opt/xos/services/vbbu/keys/vBBU_rsa
+ private_key_fn: /opt/xos/services/vpgwc/keys/vPGWC_rsa
+ #private_key_fn: /opt/xos/services/vbbu/keys/vBBU_rsa
artifacts:
- #pubkey: /opt/xos/services/vpgwc/keys/vPGWC_rsa.pub
- pubkey: /opt/xos/services/vbbu/keys/vBBU_rsa.pub
+ pubkey: /opt/xos/services/vpgwc/keys/vPGWC_rsa.pub
+ #pubkey: /opt/xos/services/vbbu/keys/vBBU_rsa.pub
m1.xlarge:
type: tosca.nodes.Flavor
@@ -318,18 +318,17 @@
network: noauto
default_node: compute10
- # TODO: will uncomment it when pgw service is ready
- #mysite_VPGWC_Component:
- # description: MCORD Service default Component
- # type: tosca.nodes.VPGWCComponent
- # requirements:
- # - provider_service:
- # node: vPGWC
- # relationship: tosca.relationships.MemberOfService
- # - vpgwc_slice:
- # node: mysite_vpgwc_slice1
- # relationship: tosca.relationships.MemberOfSlice
- # properties:
- # display_message: vPGWC looks good!
- # s5s8_pgw_tag: 300
+ mysite_VPGWC_Component:
+ description: MCORD Service default Component
+ type: tosca.nodes.VPGWCComponent
+ requirements:
+ - provider_service:
+ node: vPGWC
+ relationship: tosca.relationships.MemberOfService
+ - vpgwc_slice:
+ node: mysite_vpgwc_slice1
+ relationship: tosca.relationships.MemberOfSlice
+ properties:
+ display_message: vPGWC looks good!
+ s5s8_pgw_tag: 300