commit bd56e78af8cd460e2f7701229e8b79d6df1c417d
author Andrea Campanella <andrea@onlab.us> Thu Feb 23 15:43:21 2017 +0100
committer Zack Williams <zdw@cs.arizona.edu> Mon Mar 20 09:28:25 2017 -0700
tree 704210dae1ff5939506bc2fcc51eeb3d5e9ba7a9
parent 2184a3b8c32bc55237cdf8a7d6f0ec8a1ed3e3b9

WIP Adding vEE, vNodlocal, vNodglobal tenants to ecord

Change-Id: I78d356cf346eac5f42d6c2a1f6f289ee7948cc11

profile_manifests/ecord.yml

diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index 2a9878f..735c4be 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -20,6 +20,7 @@
   - openstack.yaml
   - vtn-service.yaml
   - fabric-service.yaml
+  - vee-service.yaml
   - ecord-services.yaml
 
 xos_other_templates:
@@ -39,18 +40,22 @@
 
 # paths defined in manifest/default.xml
 xos_services:
-  - name: vtn
-    path: onos-apps/apps/vtn
   - name: openstack
     path: orchestration/xos_services/openstack
   - name: onos
     path: orchestration/xos_services/onos-service
+  - name: vtn
+    path: onos-apps/apps/vtn
+  - name: fabric
+    path: orchestration/xos_services/fabric
   - name: vrouter
     path: orchestration/xos_services/vrouter
   - name: veg
     path: orchestration/xos_services/vEG
-  - name: fabric
-    path: orchestration/xos_services/fabric
+  - name: vnodlocal
+    path: orchestration/xos_services/metronet-local
+  - name: vee
+    path: orchestration/xos_services/vEE
   - name: veg_rsa
     source_path: "/dev/null"
   - name: veg_rsa.pub

profile_manifests/mock-ecord-global.yml

diff --git a/profile_manifests/mock-ecord-global.yml b/profile_manifests/mock-ecord-global.yml
index 2357329..02c5abe 100644
--- a/profile_manifests/mock-ecord-global.yml
+++ b/profile_manifests/mock-ecord-global.yml
@@ -18,9 +18,13 @@
 build_xos_base_image: True
 
 xos_tosca_config_templates:
-  - management-net.yaml
   - mock-onos.yaml
-  - ecord-services.yaml
+  - vnodglobal-service.yaml
+
+# GUI Config [new GUI]
+gui_project_name: "E-CORD"
+gui_background: "cord-bg.jpg" # TODO find ecord image
+gui_payoff: "Your Enterprise VNF orchestrator"
 
 # GUI branding
 gui_branding_name: "ECORD"
@@ -30,14 +34,8 @@
 
 # paths defined in manifest/default.xml
 xos_services:
-  - name: openstack
-    path: orchestration/xos_services/openstack
   - name: onos
     path: orchestration/xos_services/onos-service
-  - name: vrouter
-    path: orchestration/xos_services/vrouter
-  - name: fabric
-    path: orchestration/xos_services/fabric
   - name: metronetwork
     path: orchestration/xos_services/metro-net
 

profile_manifests/mock-ecord.yml

diff --git a/profile_manifests/mock-ecord.yml b/profile_manifests/mock-ecord.yml
index 69bd8c5..1a969db 100644
--- a/profile_manifests/mock-ecord.yml
+++ b/profile_manifests/mock-ecord.yml
@@ -20,7 +20,10 @@
 xos_tosca_config_templates:
   - management-net.yaml
   - mock-onos.yaml
+#  - vtn-service.yaml # rimosso
+#  - fabric-service.yaml # rimosso
   - ecord-services.yaml
+  - vee-service.yaml
 
 # GUI Config [new GUI]
 gui_project_name: "E-CORD"
@@ -39,14 +42,18 @@
     path: orchestration/xos_services/openstack
   - name: onos
     path: orchestration/xos_services/onos-service
+  - name: vtn
+    path: onos-apps/apps/vtn
+  - name: fabric
+    path: orchestration/xos_services/fabric
   - name: vrouter
     path: orchestration/xos_services/vrouter
   - name: veg
     path: orchestration/xos_services/vEG
   - name: vnodlocal
     path: orchestration/xos_services/metronet-local
-  - name: fabric
-    path: orchestration/xos_services/fabric
+  - name: vee
+    path: orchestration/xos_services/vEE
 
 xos_service_sshkeys:
   - name: onos_rsa