commit 060f73531ee50f2abbd14d661ac88e896c1cc0ab
author Scott Baker <smbaker@gmail.com> Thu Feb 11 16:56:34 2016 -0800
committer Scott Baker <smbaker@gmail.com> Thu Feb 11 16:56:34 2016 -0800
tree 08a77b4b283bfcbb4797ef488cd403a5d956bf4a
parent 3a41f454fd5a7e12673b816e21bfba1c43f0dfbf

more vCPE -> vSG renaming

xos/configurations/cord/cord.yaml

diff --git a/xos/configurations/cord/cord.yaml b/xos/configurations/cord/cord.yaml
index e862992..faa71ad 100644
--- a/xos/configurations/cord/cord.yaml
+++ b/xos/configurations/cord/cord.yaml
@@ -11,7 +11,7 @@
     service_volt:
       type: tosca.nodes.Service
       requirements:
-          - vcpe_tenant:
+          - vsg_tenant:
               node: service_vsg
               relationship: tosca.relationships.TenantOfService
           - lan_network:
@@ -190,13 +190,13 @@
               node: Private
               relationship: tosca.relationships.UsesNetworkTemplate
           - owner:
-              node: mysite_vcpe
+              node: mysite_vsg
               relationship: tosca.relationships.MemberOfSlice
           - connection:
-              node: mysite_vcpe
+              node: mysite_vsg
               relationship: tosca.relationships.ConnectsToSlice
           - connection:
-              node: mysite_volt
+              node: mysite_vsg
               relationship: tosca.relationships.ConnectsToSlice
 
     wan_network:
@@ -208,13 +208,13 @@
               node: Private
               relationship: tosca.relationships.UsesNetworkTemplate
           - owner:
-              node: mysite_vcpe
+              node: mysite_vsg
               relationship: tosca.relationships.MemberOfSlice
           - connection:
-              node: mysite_vcpe
+              node: mysite_vsg
               relationship: tosca.relationships.ConnectsToSlice
           - connection:
-              node: mysite_vbng
+              node: mysite_vsg
               relationship: tosca.relationships.ConnectsToSlice
 
     Private-Direct:
@@ -265,18 +265,18 @@
 
 
     # CORD Slices
-    mysite_vcpe:
-      description: vCPE Controller Slice
+    mysite_vsg:
+      description: vSG Controller Slice
       type: tosca.nodes.Slice
       requirements:
-          - vcpe_service:
+          - vsg_service:
               node: service_vsg
               relationship: tosca.relationships.MemberOfService
           - site:
               node: mysite
               relationship: tosca.relationships.MemberOfSite
-          - vcpe_docker_image:
-              node: docker-vcpe
+          - vsg_docker_image:
+              node: docker-vsg
               relationship: tosca.relationships.UsesImage
 #      properties:
 #          default_isolation: container
@@ -442,8 +442,8 @@
                 node: mysite_clients
                 relationship: tosca.relationships.MemberOfSlice
 
-    # docker image for vcpe containers
-    docker-vcpe:
+    # docker image for vsg containers
+    docker-vsg:
       # TODO: need to attach this to mydeployment
       type: tosca.nodes.Image
       properties:

xos/services/cord/models.py

diff --git a/xos/services/cord/models.py b/xos/services/cord/models.py
index 3dfe514..0dc1df5 100644
--- a/xos/services/cord/models.py
+++ b/xos/services/cord/models.py
@@ -403,7 +403,7 @@
 
     class Meta:
         app_label = "cord"
-        verbose_name = "vCPE Service"
+        verbose_name = "vSG Service"
         proxy = True
 
     def allocate_bbs_account(self):