From d1225dbb01f0759ef8726fa3ea05ad88c6bf54bc Mon Sep 17 00:00:00 2001 From: lizi00164331 Date: Thu, 10 Aug 2017 10:16:34 +0800 Subject: Remove the openo tag for esr-gui repository Remove the openo tag from code and change the file name about openo Change-Id: I3f3ecfe88824758484e8364ee51d2b9b0e53818a Issue-ID: AAI-143 Signed-off-by: lizi00164331 --- esr/src/main/webapp/extsys/ems/js/emsController.js | 10 +- .../extsys/sdncontroller/bak/controller.html | 136 ++++++++++----------- .../webapp/extsys/sdncontroller/bak/css/RMain.css | 40 +++--- .../webapp/extsys/sdncontroller/bak/css/VMMain.css | 124 +++++++++---------- .../extsys/sdncontroller/bak/images/onap.png | Bin 0 -> 49007 bytes .../extsys/sdncontroller/bak/images/openo.png | Bin 49007 -> 0 bytes .../extsys/sdncontroller/bak/js/controller.js | 20 +-- .../main/webapp/extsys/sdncontroller/index.html | 28 ++--- esr/src/main/webapp/extsys/sdncontroller/js/app.js | 20 +-- .../main/webapp/extsys/sdncontroller/js/rest.js | 8 +- esr/src/main/webapp/extsys/vim/js/vimController.js | 8 +- .../main/webapp/extsys/vnfm/js/vnfmController.js | 10 +- 12 files changed, 202 insertions(+), 202 deletions(-) create mode 100644 esr/src/main/webapp/extsys/sdncontroller/bak/images/onap.png delete mode 100644 esr/src/main/webapp/extsys/sdncontroller/bak/images/openo.png (limited to 'esr/src/main') diff --git a/esr/src/main/webapp/extsys/ems/js/emsController.js b/esr/src/main/webapp/extsys/ems/js/emsController.js index cf1c763..567af53 100644 --- a/esr/src/main/webapp/extsys/ems/js/emsController.js +++ b/esr/src/main/webapp/extsys/ems/js/emsController.js @@ -32,12 +32,12 @@ var vm = avalon failed: "inactive" }, $restUrl: { - queryEmsInfoUrl: '/openoapi/extsys/v1/emss', - addEmsInfoUrl: '/openoapi/extsys/v1/emss', - updateEmsInfoUrl: '/openoapi/extsys/v1/emss/', - delEmsInfoUrl: '/openoapi/extsys/v1/emss/', + queryEmsInfoUrl: '/onapapi/aai/esr/v1/emss', + addEmsInfoUrl: '/onapapi/aai/esr/v1/emss', + updateEmsInfoUrl: '/onapapi/aai/esr/v1/emss/', + delEmsInfoUrl: '/onapapi/aai/esr/v1/emss/', queryMocUrl: '', - queryVimUrl: '/openoapi/extsys/v1/vims' + queryVimUrl: '/onapapi/aai/esr/v1/vims' }, $htmlText: { saveSuccess: $.i18n.prop("nfv-ems-iui-message-save-success"), diff --git a/esr/src/main/webapp/extsys/sdncontroller/bak/controller.html b/esr/src/main/webapp/extsys/sdncontroller/bak/controller.html index 5397e6e..84bfdba 100644 --- a/esr/src/main/webapp/extsys/sdncontroller/bak/controller.html +++ b/esr/src/main/webapp/extsys/sdncontroller/bak/controller.html @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + - + + + - - + + - - - - - - - + + + + + + + diff --git a/esr/src/main/webapp/extsys/sdncontroller/js/app.js b/esr/src/main/webapp/extsys/sdncontroller/js/app.js index 25fb256..1d2de03 100644 --- a/esr/src/main/webapp/extsys/sdncontroller/js/app.js +++ b/esr/src/main/webapp/extsys/sdncontroller/js/app.js @@ -358,20 +358,20 @@ function loadTemplate() { /*var modelTemplate = ""; function loadTemplate() { - *//*$.get('/openoui/framework/template.html', function (template) { + *//*$.get('/onapui/framework/template.html', function (template) { modelTemplate += template; });*//* - $.get('/openoui/framework/templateContainer.html', function (template) { + $.get('/onapui/framework/templateContainer.html', function (template) { modelTemplate += template; }); - $.get('/openoui/framework/templateWidget.html', function (template) { + $.get('/onapui/framework/templateWidget.html', function (template) { //console.log("Template is : "+template); modelTemplate += template; }); - $.get('/openoui/framework/templateNotification.html', function (template) { + $.get('/onapui/framework/templateNotification.html', function (template) { modelTemplate += template; }); - $.get('/openoui/framework/templateFunctional.html', function (template) { + $.get('/onapui/framework/templateFunctional.html', function (template) { modelTemplate += template; }); }*/ @@ -379,20 +379,20 @@ function loadTemplate() { var modelTemplate = ""; function loadTemplate() { - /*$.get('/openoui/resmgr/templates/template.html', function (template) { + /*$.get('/onapui/resmgr/templates/template.html', function (template) { modelTemplate += template; });*/ - $.get('/openoui/extsys/sdncontroller/templates/templateContainer.html', function (template) { + $.get('/onapui/extsys/sdncontroller/templates/templateContainer.html', function (template) { modelTemplate += template; }); - $.get('/openoui/extsys/sdncontroller/templates/templateWidget.html', function (template) { + $.get('/onapui/extsys/sdncontroller/templates/templateWidget.html', function (template) { //console.log("Template is : "+template); modelTemplate += template; }); - $.get('/openoui/extsys/sdncontroller/templates/templateNotification.html', function (template) { + $.get('/onapui/extsys/sdncontroller/templates/templateNotification.html', function (template) { modelTemplate += template; }); - $.get('/openoui/extsys/sdncontroller/templates/templateFunctional.html', function (template) { + $.get('/onapui/extsys/sdncontroller/templates/templateFunctional.html', function (template) { modelTemplate += template; }); } diff --git a/esr/src/main/webapp/extsys/sdncontroller/js/rest.js b/esr/src/main/webapp/extsys/sdncontroller/js/rest.js index 1279c42..2a1ff66 100644 --- a/esr/src/main/webapp/extsys/sdncontroller/js/rest.js +++ b/esr/src/main/webapp/extsys/sdncontroller/js/rest.js @@ -29,7 +29,7 @@ app.factory("controllerDataService", function($http, DataService, $log){ //$log.info(response); return response.data; });*/ - return DataService.get(uri+'/openoapi/extsys/v1/sdncontrollers') + return DataService.get(uri+'/onapapi/aai/esr/v1/sdncontrollers') .then(function(response){ $log.info("in get data service data is :"+response); console.log(response); @@ -47,7 +47,7 @@ app.factory("controllerDataService", function($http, DataService, $log){ $log.info(response.data); return response.data; });*/ - return DataService.post(uri+'/openoapi/extsys/v1/sdncontrollers', controllerData) + return DataService.post(uri+'/onapapi/aai/esr/v1/sdncontrollers', controllerData) .then(function(response){ console.log("Successfully added.. Data returned in DataService is"); console.log(response.data); @@ -65,7 +65,7 @@ app.factory("controllerDataService", function($http, DataService, $log){ $log.info(response); return response.data; });*/ - return DataService.delete(uri+'/openoapi/extsys/v1/sdncontrollers/'+id) + return DataService.delete(uri+'/onapapi/aai/esr/v1/sdncontrollers/'+id) .then(function(response){ $log.info("in delete data service data is :"+response); console.log(response); @@ -84,7 +84,7 @@ app.factory("controllerDataService", function($http, DataService, $log){ return response.data; });*/ - return DataService.put(uri+'/openoapi/extsys/v1/sdncontrollers', controllerData) + return DataService.put(uri+'/onapapi/aai/esr/v1/sdncontrollers', controllerData) .then(function(response){ console.log("Successfully edited.. Data returned in DataService is"); console.log(response.data); diff --git a/esr/src/main/webapp/extsys/vim/js/vimController.js b/esr/src/main/webapp/extsys/vim/js/vimController.js index a96b3d5..612a9ef 100644 --- a/esr/src/main/webapp/extsys/vim/js/vimController.js +++ b/esr/src/main/webapp/extsys/vim/js/vimController.js @@ -37,10 +37,10 @@ var vm = avalon }, isSave: true, action: {ADD: 'add', UPDATE: 'update'}, - $queryVimInfoUrl: '/openoapi/extsys/v1/vims', - $addVimInfoUrl: '/openoapi/extsys/v1/vims/', - $updateVimInfoUrl: '/openoapi/extsys/v1/vims/', - $delVimInfoUrl: '/openoapi/extsys/v1/vims/{vim_id}', + $queryVimInfoUrl: '/onapapi/aai/esr/v1/vims', + $addVimInfoUrl: '/onapapi/aai/esr/v1/vims/', + $updateVimInfoUrl: '/onapapi/aai/esr/v1/vims/', + $delVimInfoUrl: '/onapapi/aai/esr/v1/vims/{vim_id}', $initTable: function () { $.ajax({ "type": 'get', diff --git a/esr/src/main/webapp/extsys/vnfm/js/vnfmController.js b/esr/src/main/webapp/extsys/vnfm/js/vnfmController.js index f05f4bf..1df32b1 100644 --- a/esr/src/main/webapp/extsys/vnfm/js/vnfmController.js +++ b/esr/src/main/webapp/extsys/vnfm/js/vnfmController.js @@ -32,12 +32,12 @@ var vm = avalon failed: "inactive" }, $restUrl: { - queryVnfmInfoUrl: '/openoapi/extsys/v1/vnfms', - addVnfmInfoUrl: '/openoapi/extsys/v1/vnfms', - updateVnfmInfoUrl: '/openoapi/extsys/v1/vnfms/', - delVnfmInfoUrl: '/openoapi/extsys/v1/vnfms/', + queryVnfmInfoUrl: '/onapapi/aai/esr/v1/vnfms', + addVnfmInfoUrl: '/onapapi/aai/esr/v1/vnfms', + updateVnfmInfoUrl: '/onapapi/aai/esr/v1/vnfms/', + delVnfmInfoUrl: '/onapapi/aai/esr/v1/vnfms/', queryMocUrl: '', - queryVimUrl: '/openoapi/extsys/v1/vims' + queryVimUrl: '/onapapi/aai/esr/v1/vims' }, $htmlText: { saveSuccess: $.i18n.prop("nfv-vnfm-iui-message-save-success"), -- cgit