Merge "fixing backend_status and README update"
diff --git a/README.md b/README.md
index 8bf5d91..36b33c4 100755
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
-## Metronet Service
-
-This repository contains components needed for the XOS Metronetwork service
+## vNaaS - Virtual Network as a Service
###Sub-directories
-* xos: A service definition for the Metronetwork. This follows the XOS component design for onboarding.
-* xos/gui: The XOS GUI extension for Metronet that displays UserNetworkInterfaces and ELines on a map
\ No newline at end of file
+* xos: Provides service definitions. This follows the XOS component design for onboarding.
+* xos/gui: The XOS GUI extension for vNaaS displays ethernet virtual private lines and allows users to draw connections between user network interfaces on a map.
\ No newline at end of file
diff --git a/xos/gui/conf/app/mapconstants.local.js b/xos/gui/conf/app/mapconstants.local.js
index 217b8c0..cd2a207 100755
--- a/xos/gui/conf/app/mapconstants.local.js
+++ b/xos/gui/conf/app/mapconstants.local.js
@@ -18,5 +18,5 @@
angular.module('app')
.constant('MapConfig', {
- marker: './xos/extensions/vnaasgui/app/img/co.png',
+ marker: './xos/extensions/vnaas/app/img/co.png',
});
diff --git a/xos/gui/conf/app/mapconstants.production.js b/xos/gui/conf/app/mapconstants.production.js
index 12c3498..17b6dd0 100755
--- a/xos/gui/conf/app/mapconstants.production.js
+++ b/xos/gui/conf/app/mapconstants.production.js
@@ -18,5 +18,5 @@
angular.module('vnaasgui')
.constant('MapConfig', {
- marker: './extensions/vnaasgui/app/img/co.png',
+ marker: './extensions/vnaas/app/img/co.png',
});
diff --git a/xos/gui/conf/gulp.conf.js b/xos/gui/conf/gulp.conf.js
index f5e4f2a..404cea5 100755
--- a/xos/gui/conf/gulp.conf.js
+++ b/xos/gui/conf/gulp.conf.js
@@ -25,7 +25,7 @@
exports.paths = {
src: 'src',
- dist: 'dist/extensions/vnaasgui',
+ dist: 'dist/extensions/vnaas',
appConfig: 'conf/app',
tmp: '.tmp',
e2e: 'e2e',
diff --git a/xos/gui/src/app/components/vnaasMap.component.html b/xos/gui/src/app/components/vnaasMap.component.html
index 80d1649..7869ad2 100755
--- a/xos/gui/src/app/components/vnaasMap.component.html
+++ b/xos/gui/src/app/components/vnaasMap.component.html
@@ -61,7 +61,7 @@
name="polyline"
id="eline-{{eline.id}}"
path="{{eline.path}}"
- stroke-color="{{vm.colorLine(eline.backend_status)}}"
+ stroke-color="{{vm.colorLine(eline.backend_code)}}"
stroke-opacity="1.0"
stroke-weight="5"
on-click="vm.elinePanel({{eline}}, true)"