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 <os0695@att.com>

3 files changed, 24 insertions, 3 deletions

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/<service_instance_id>/vnfs/<
 mso.restapi.volume.group.instance=/serviceInstances/v4/<service_instance_id>/vnfs/<vnf_instance_id>/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 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/instantiate.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" />

 <link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" />

+<link rel="stylesheet" type="text/css" href="app/vid/styles/angularjs-datetime-picker.css"></link>

+<link rel="stylesheet" type="text/css" href="app/vid/external/bootstrap/css/bootstrap.min.css" />

+<link rel="stylesheet" type="text/css" href="app/vid/styles/common.css" />

 

 	

 	<script>

@@ -17,14 +20,20 @@
 <!-- Latest compiled and minified JavaScript -->

 

 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>

-

+<script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>

 

 <script src="app/vid/scripts/angular-ui-tree.js"></script>

 

+<script src="app/vid/external/lodash/lodash.min.js"></script>

 <script src="app/vid/scripts/constants/componentConstants.js"></script>

 <script src="app/vid/scripts/constants/fieldConstants.js"></script>

 <script src="app/vid/scripts/constants/vidConfiguration.js"></script>

 <script src="app/vid/scripts/constants/parameterConstants.js"></script>

+<script src="app/vid/scripts/filters/change-managements-by-statuses.filter.js"></script>

+<script src="app/vid/scripts/filters/date.filter.js"></script>

+<script src="app/vid/scripts/modals/change-management-manual-tasks-controller/change-management-manual-tasks.controller.js"></script>

+<script src="app/vid/scripts/modals/new-change-management/new-change-management.controller.js"></script>

+<script src="app/vid/scripts/modals/new-scheduler/new-scheduler.controller.js"></script>

 <script src="app/vid/scripts/controller/aaiSubscriberController.js"></script>

 <script src="app/vid/scripts/controller/creationDialogController.js"></script>

 <script src="app/vid/scripts/controller/deletionDialogController.js"></script>

@@ -35,11 +44,17 @@
 <script src="app/vid/scripts/controller/ServiceModelController.js"></script>

 <script src="app/vid/scripts/controller/previousVersionDialogController.js"></script>

 <script src="app/vid/scripts/controller/previousVersionContoller.js"></script>

+<script src="app/vid/scripts/controller/change-management.controller.js"></script>

+

+<script src="app/vid/scripts/directives/angularjs-datetime-picker.js"></script>

+

+

 <script src="app/vid/scripts/directives/extensionsDirective.js"></script>

 <script src="app/vid/scripts/directives/parameterBlockDirective.js"></script>

 <script src="app/vid/scripts/directives/popupWindowDirective.js"></script>

 <script src="app/vid/scripts/directives/progressBarDirective.js"></script>

 <script src="app/vid/scripts/services/aaiService.js"></script>

+<script src="app/vid/scripts/services/schedulerService.js"></script>

 <script src="app/vid/scripts/services/asdcService.js"></script>

 <script src="app/vid/scripts/services/componentService.js"></script>

 <script src="app/vid/scripts/services/creationService.js"></script>

@@ -51,6 +66,7 @@
 <script src="app/vid/scripts/services/propertyService.js"></script>

 <script src="app/vid/scripts/services/utilityService.js"></script>

 <script src="app/vid/scripts/services/vnfService.js"></script>

+<script src="app/vid/scripts/services/change-management.service.js"></script>

 

 <%@ 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 @@
-

+<script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>

 <div>

      <h1 class="heading1">ONAP</h1>

      <br>