From 1ba64a4a45f26e8bdb58e866e540aa58f32e2e52 Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Wed, 20 Sep 2017 14:08:19 +0300 Subject: Change management and PNF support Issue-ID: VID-44, VID-48, VID-49, VID-50, VID-51, VID-52 Change-Id: I83e940aad2e4e294a0927b546c4c08ca8e539a65 Signed-off-by: Ofir Sonsino --- epsdk-app-onap/.classpath | 6 ------ .../src/main/webapp/WEB-INF/conf/system.properties | 7 ++++++- .../src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 18 +++++++++++++++++- epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp | 2 +- .../webapp/app/fusion/external/ebz/angular_js/app.js | 5 ++--- .../app/fusion/external/ebz/angular_js/appDS2.js | 3 +-- .../multiselect/angular-bootstrap-multiselect.min.js | 1 + 7 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js (limited to 'epsdk-app-onap') diff --git a/epsdk-app-onap/.classpath b/epsdk-app-onap/.classpath index ede37b2b3..f210876be 100755 --- a/epsdk-app-onap/.classpath +++ b/epsdk-app-onap/.classpath @@ -11,12 +11,6 @@ - - - - - - diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties index e7623665d..0cbc3126a 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties @@ -165,10 +165,15 @@ mso.restapi.vf.module.instance=/serviceInstances/v4//vnfs/< mso.restapi.volume.group.instance=/serviceInstances/v4//vnfs//volumeGroups mso.restapi.get.orc.req=/orchestrationRequests/v4 mso.restapi.get.orc.reqs=/orchestrationRequests/v4? +mso.restapi.get.man.tasks=/tasks/v1 vid.truststore.filename=/opt/app/vid/etc/vid_keystore.jks mso.dme2.client.timeout=30000 mso.dme2.client.read.timeout=120000 vid.truststore.filename=vid_keystore.jks vid.truststore.passwd.x=OBF:1wgg1wfq1uus1uui1x131x0r1x1v1x1j1uvo1uve1wg81wfi +scheduler.create.new.vnf.change.instance=/v1/ChangeManagement/schedules/ +scheduler.get.time.slots=/v1/ChangeManagement/schedules/ +scheduler.server.url=http://BYO.scheduler:8989/scheduler - +scheduler.submit.new.vnf.change=/v1/ChangeManagement/schedules/{scheduleId}/approvals +scheduler.get.schedules=/v1/ChangeManagement/schedules/scheduleDetails/ \ No newline at end of file diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp index 6d2305108..d0c36d47a 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp @@ -6,6 +6,9 @@ + + + - + + + + + + + @@ -35,11 +44,17 @@ + + + + + + @@ -51,6 +66,7 @@ + <%@ page import="org.openecomp.vid.mso.*"%> <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp index 9cb6f85b7..ad5331d98 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -1,4 +1,4 @@ - +

ONAP


diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js index 0787015bf..59e27470f 100755 --- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js @@ -1,6 +1,5 @@ angular.module('att.abs.helper', []); angular.module('quantum', []); -angular.module('ui.bootstrap', []); -var app=angular.module("abs", ["att.abs", "att.abs.helper","modalServices", - "att.gridster","checklist-model","ngRoute", "ui.bootstrap","ngCookies"]); +var app=angular.module("abs", ["att.abs", "att.abs.helper","modalServices", /*'ngAnimate','ngTouch',*/ 'ui.bootstrap', + "att.gridster","checklist-model","ngRoute", "ngCookies", 'btorfs.multiselect']); diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/appDS2.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/appDS2.js index 3a101934c..d982b7855 100755 --- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/appDS2.js +++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/appDS2.js @@ -1,5 +1,4 @@ angular.module('att.abs.helper', []); angular.module('quantum', []); -angular.module('ui.bootstrap', []); -var appDS2=angular.module("abs", ["ngRoute", 'ngMessages', 'ngCookies', 'b2b.att.tpls', 'ddh.att.tpls', 'ddh.att.switches', 'b2b.att.footer', 'b2b.att.header']); +var appDS2=angular.module("abs", ["ngRoute", /*'ngAnimate', 'ngTouch',*/ 'ui.bootstrap', 'ngMessages', 'ngCookies', 'b2b.att.tpls', 'ddh.att.tpls', 'ddh.att.switches', 'b2b.att.footer', 'b2b.att.header', 'btorfs.multiselect']); var app = appDS2; diff --git a/epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js b/epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js new file mode 100644 index 000000000..b9be2c7e4 --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/app/vid/external/multiselect/angular-bootstrap-multiselect.min.js @@ -0,0 +1 @@ +!function(){"use strict";var a=angular.module("btorfs.multiselect",["btorfs.multiselect.templates"]);a.getRecursiveProperty=function(a,b){return b.split(".").reduce(function(a,b){return a?a[b]:null},a)},a.directive("multiselect",["$filter","$document","$log",function(b,c,d){return{restrict:"AE",scope:{options:"=",displayProp:"@",idProp:"@",searchLimit:"=?",selectionLimit:"=?",showSelectAll:"=?",showUnselectAll:"=?",showSearch:"=?",searchFilter:"=?",disabled:"=?ngDisabled",labels:"=?",showTooltip:"=?",placeholder:"@?"},require:"ngModel",templateUrl:"multiselect.html",link:function(b,e,f,g){b.selectionLimit=b.selectionLimit||0,b.searchLimit=b.searchLimit||25,b.searchFilter="",b.resolvedOptions=[],"function"!=typeof b.options&&(b.resolvedOptions=b.options),"undefined"!=typeof f.disabled&&(b.disabled=!0);var h=function(a){e[0].contains(a.target)||b.$apply(function(){b.open=!1})};c.on("click",h);var i=function(){g.$viewValue?(b.selectedOptions=b.resolvedOptions.filter(function(a){for(var c=b.getId(a),d=0;d1){var a=angular.isDefined(b.selectedOptions)?b.selectedOptions.length:0;return 0===a?b.labels&&b.labels.select?b.labels.select:b.placeholder||"Select":a+" "+(b.labels&&b.labels.itemsSelected?b.labels.itemsSelected:"selected")}return b.labels&&b.labels.select?b.labels.select:b.placeholder||"Select"},b.selectAll=function(){b.selectedOptions=b.resolvedOptions.slice(),b.unselectedOptions=[]},b.unselectAll=function(){b.selectedOptions=[],b.unselectedOptions=b.resolvedOptions.slice()},b.toggleItem=function(a){"undefined"==typeof b.selectedOptions&&(b.selectedOptions=[]);var c=b.selectedOptions.indexOf(a),d=c!==-1;if(d)b.unselectedOptions.push(b.selectedOptions[c]),b.selectedOptions.splice(c,1);else if(!d&&(0===b.selectionLimit||b.selectedOptions.lengthb.searchLimit)return!1;var d=b.getDisplay(c);if(d){var e=d.toLowerCase().indexOf(b.searchFilter.toLowerCase())>-1;return e&&a++,e}}}}}}])}(),angular.module("btorfs.multiselect.templates",["multiselect.html"]),angular.module("multiselect.html",[]).run(["$templateCache",function(a){a.put("multiselect.html",'
\n \n \n
\n')}]); \ No newline at end of file -- cgit 1.2.3-korg