[Bug 5131]- Hard-coded base url in Ovsdb-ui

- Localhost is hard-coded in Northbond handler, so make it dynamic.
- Use a empty gif has logo so you won't see a broken image and 404 error
  log

Change-Id: Ie30c15b8e818ccec2038908af5ffb02a2b595a7a
Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>

diff --git a/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js
index 4aac68f04d264adbed8bd4a126fb13c5347eb6ac..95a8c9bbd4712e4a21dd160156e599d3edde05a7 100644 (file)
--- a/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js
+++ b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.controller.js
@@ -9,7 +9,9 @@ define(['jquery', 'underscore', 'app/ovsdb/ovsdb.module', 'app/ovsdb/OvsCore', '
   'use strict';\r
 \r
   var RootOvsdbCtrl = function ($rootScope, cssInjector) {\r
-    $rootScope['section_logo'] = 'logo_ovsdb';\r
+    // transparent 1px gif picture\r
+    $rootScope['section_logo'] = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=';\r
+\r
     cssInjector.add('src/app/ovsdb/css/select2.min.css');\r
     cssInjector.add('src/app/ovsdb/css/toggle-switch.css');\r
 \r

diff --git a/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js
index 4ef135c3f7a083e4807247d6fa7671c8756ef917..d3e28061a06b1bd199e3595f7c4c97f347cb4dd7 100644 (file)
--- a/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js
+++ b/ovsdb-ui/module/src/main/resources/ovsdb/ovsdb.services.js
@@ -17,7 +17,8 @@ define(['app/ovsdb/ovsdb.module', 'app/ovsdb/OvsCore', 'underscore', 'app/ovsdb/
   // nbv2 support depricated in dlux
   ovsdb.register.factory('NeutronRestangular', ['Restangular', function (Restangular) {
     return Restangular.withConfig(function (RestangularConfig) {
-      RestangularConfig.setBaseUrl('http://localhost:8080/controller/nb/v2/neutron');
+      var baseUrl = window.location.protocol + '//' + window.location.hostname;
+      RestangularConfig.setBaseUrl(baseUrl + ':8080/controller/nb/v2/neutron');
     });
   }]);