commit 91aceafac5d6453d5decbde9ba03232abf108c3c
author Laurence Maultsby <laurence.maultsby@riftio.com> Fri Jan 27 14:26:04 2017 -0500
committer Laurence Maultsby <laurence.maultsby@riftio.com> Fri Jan 27 14:26:51 2017 -0500
tree 8e96d5edefb89cbd17b14d8ebfb3f7d508c24e6a
parent ab1296ba58f614eaf228c718e171d7dd59e76388
parent bd152933a991a8eebb5c27974b00ce51ba915d8d

Merge branch 'v1.1'

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>

skyquake/plugins/accounts/src/account/accountStore.js

diff --git a/skyquake/plugins/accounts/src/account/accountStore.js b/skyquake/plugins/accounts/src/account/accountStore.js
index dee59f2..5d5bd2f 100644
--- a/skyquake/plugins/accounts/src/account/accountStore.js
+++ b/skyquake/plugins/accounts/src/account/accountStore.js
@@ -115,14 +115,6 @@
             }, {
                 label: "Authentication URL",
                 ref: 'auth_url'
-            },{
-                label: "User Domain",
-                ref: 'user-domain',
-                optional: true
-            },{
-                label: "Project Domain",
-                ref: 'project-domain',
-                optional: true
             }, {
                 label: "Tenant",
                 ref: 'tenant'
@@ -133,6 +125,18 @@
                 label: 'Floating IP Pool',
                 ref: 'floating-ip-pool',
                 optional: true
+            }, {
+                label: "User Domain",
+                ref: 'user-domain',
+                optional: true
+            }, {
+                label: "Project Domain",
+                ref: 'project-domain',
+                optional: true
+            }, {
+              label: "Region",
+              ref: 'region',
+              optional: true
             }],
             "openvim": [{
                 label: "Host",

skyquake/plugins/launchpad/api/launchpad.js

diff --git a/skyquake/plugins/launchpad/api/launchpad.js b/skyquake/plugins/launchpad/api/launchpad.js
index 509ff77..6fb0170 100644
--- a/skyquake/plugins/launchpad/api/launchpad.js
+++ b/skyquake/plugins/launchpad/api/launchpad.js
@@ -813,7 +813,7 @@
             vdur['console-url'] = 'api/vnfr/' + vnfr.id + '/vdur/' + vdur.id + '/console-url';
             nsr['console-urls'].push({
                 id: vdur.id,
-                name: vdur.name,
+                name: vnfr.name,
                 'console-url': vdur['console-url']
             });
         });