org.onap migration

Change-Id: I52f0b2851f2c765752b6d21f49b32136d7d72a3d
Issue-ID: VID-86
Signed-off-by: Ofir Sonsino <os0695@att.com>

6 files changed, 468 insertions, 31 deletions

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp
new file mode 100644
index 00000000..fd2030e6
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/createnewserviceinstance.jsp
@@ -0,0 +1,146 @@
+<script>
+app.controller('createNewSIController',['$scope','$http',function ($scope,$http) { 
+	
+    $scope.searchCategory = "";
+    $scope.searchString = "";
+ 	$scope.tableData=[];
+ 	$scope.displayData=[];
+ 	$scope.selectedSubscriber = $scope.tableData[0]; 
+    $scope.selectedServiceType = "Select Service Type";
+ 	function escapeRegExp(str) {
+ 		return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|\&]/g, " ");
+ 	}
+ 	$scope.serviceTypes=["Select Service Type", "uCPE-VMS", "SDN-L3-BONDING", "SDN-ETHERNET-INTERNET"];
+ 	
+ 	$scope.getSubscribers = function(refresh){
+ 
+ 		var refreshTxt = 'refresh_subscribers';
+ 		var getTxt = 'get_subscribers';
+ 		var selectedTxt = getTxt;
+ 		if (refresh)
+ 			selectedTxt = refreshTxt;
+		$http.get(selectedTxt).
+			then(function(response){
+				var data = JSON.parse(response.data.result);
+				$scope.tableData = data['customer'];
+				$scope.initSubscriberList();
+			})
+			.catch(function(data,status){
+			console.log("Error: " + status + " : " + data); 					
+			})
+			.finally(function() {
+				
+			});
+ 		
+ 	}
+ 
+
+ 	$scope.initSubscriberList = function () {
+ 		//$scope.selectedSubscriber = $scope.selectedSubscriber['subscriber-name'] || $scope.tableData[0]['subscriber-name'];
+ 		$scope.selectedSubscriber = 'Select Subscriber Name';
+ 	}
+ 	
+ 	$scope.initSrvcTypeList = function () {
+ 		$scope.selectedServiceType = $scope.serviceTypes[0];  
+ 	}
+
+ 	$scope.getSubscriberDetails = function(selectedSubscriber){
+		if (selectedSubscriber == 'Select Subscriber Name')
+			return;
+ 		$http.get('createsubscriber/' + encodeURIComponent(selectedSubscriber)).
+		then(function(response){
+		//	window.location.href = 'createsubscriberdetails.htm';
+		})
+		.catch(function(data,status){
+		console.log("Error: " + status + " : " + data); 					
+		})
+		.finally(function() {
+			
+		});
+	}
+	
+	$scope.disableSubmitBtn = function (subName, svcType) {
+		return (typeof subName === "undefined") && (svcType == 'Select Service Type');
+ 		//return (subName == 'Select Subscriber Name') && (svcType == 'Select Service Type');
+ 	}
+	
+    $scope.cancelCreateSI = function(selectedSubscriber){
+ 		
+		window.location.href = 'welcome.htm';
+		
+	}
+	
+ 	$scope.getSubscribers(false);
+ 	//$scope.initSubscriberList();
+ 	
+}]);
+
+
+</script>
+
+<div ng-controller="createNewSIController">
+     
+     <h1 class="heading1"><center>Create New Service Instance</center></h1>
+	
+
+<BR>
+ <table> <tr>
+   
+   <td width="5%" align="left">
+	<!--  <a ng-click="getSubscriberDetails(selectedSubscriber['global-customer-id']);" ng-disabled="disableSubmitBtn(selectedSubscriber['subscriber-name'], selectedServiceType);" ><img src="static/fusion/images/plus.png"></a>-->
+  <input type="image" ng-click="getSubscriberDetails(selectedSubscriber['global-customer-id']);" ng-disabled="disableSubmitBtn(selectedSubscriber['subscriber-name'], selectedServiceType);" src="static/fusion/images/plus.png"/>
+   </td>
+   
+	<td style="width:10%" align="left"><div class="fn-ebz-container">	
+		<label  class="fn-ebz-text-label">Subscriber:</label>
+		</div> </td>
+	<td style="width:30%"><div class="fn-ebz-container">
+		<select  ng-model="selectedSubscriber"  ng-options="resultdata['subscriber-name'] for resultdata in tableData" required>
+		<option value="">Select Subscriber Name</option>
+		</select>
+	</div></td>
+	 <td width="5%" align="left">
+		  <input type="image" ng-click="getSubscribers(true);" src="static/fusion/images/refresh.jpg"/>
+      </td>
+	
+	<td width="5%"> </td>
+<td style="width:10%" align="left">
+
+    
+	<div class="fn-ebz-container">	
+		<label  class="fn-ebz-text-label">Service Type:</label>
+	</div> </td>
+    <td style="width:32%"><div class="fn-ebz-container">
+		<select  ng-model="selectedServiceType"  ng-options="sType for sType in serviceTypes" ng-init="initSrvcTypeList();" ></select>
+	</div> </td>
+	
+	<td width="5%"> </td>
+	
+    </tr>
+    </table>
+ 
+	<center>
+		<button type="cancel" ng-click="cancelCreateSI();" att-button size="small">Cancel</button>
+	</center>
+	
+
+
+</div>
+<!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
new file mode 100644
index 00000000..ca840e62
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp
@@ -0,0 +1,81 @@
+<link rel="stylesheet" type="text/css" href="app/vid/styles/subscriberSearch.css" />
+
+<script src="app/vid/scripts/controller/VidApp.js"></script>
+<script src="app/vid/scripts/controller/subscriberSearch.js"></script>
+
+<script src="app/vid/scripts/controller/aaiSubscriberController.js"></script>
+<script src="app/vid/scripts/services/utilityService.js"></script>
+<script src="app/vid/scripts/angular-ui-tree.js"></script>
+
+<link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" />
+
+<script src="app/vid/test/testAaiData.js"></script>
+
+<script src="app/vid/scripts/controller/creationDialogController.js"></script>
+<script src="app/vid/scripts/controller/deleteResumeDialogController.js"></script>
+<script src="app/vid/scripts/controller/detailsDialogController.js"></script>
+<script src="app/vid/scripts/controller/statusDialogController.js"></script>
+<script src="app/vid/scripts/controller/msoCommitController.js"></script>
+
+<script src="app/vid/scripts/services/aaiService.js"></script>
+<script src="app/vid/scripts/services/asdcService.js"></script>
+<script src="app/vid/scripts/services/creationService.js"></script>
+<script src="app/vid/scripts/services/dataService.js"></script>
+<script src="app/vid/scripts/services/deleteResumeService.js"></script>
+<script src="app/vid/scripts/services/detailsService.js"></script>
+<script src="app/vid/scripts/services/statusService.js"></script>
+<script src="app/vid/scripts/services/componentService.js"></script>
+<script src="app/vid/scripts/services/msoService.js"></script>
+<script src="app/vid/scripts/services/propertyService.js"></script>
+<script src="app/vid/scripts/services/utilityService.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/constants/componentConstants.js"></script>
+<script src="app/vid/scripts/constants/fieldConstants.js"></script>
+<script src="app/vid/scripts/constants/parameterConstants.js"></script>
+
+<link rel="stylesheet" type="text/css" href="app/vid/styles/aaiGetSubs.css" />
+<link rel="stylesheet" type="text/css" href="app/vid/styles/aaiSubDetails.css" />
+<link rel="stylesheet" type="text/css" href="app/vid/styles/angular-ui-tree.css" />
+<link rel="stylesheet" type="text/css" href="app/vid/styles/vidTree.css" />
+
+<%@ page import="org.openecomp.vid.mso.*"%>
+<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>
+<%
+	String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS)
+			+ ",msoMaxPollingIntervalMsec:"
+			+ SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}";
+%>
+
+<div ng-controller="aaiSubscriberSearchController"
+	ng-init="init(<%=properties%>);" ng-cloak>
+
+
+ 
+	<div ng-view></div>
+	
+</div>
+
+<!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+
+		
\ 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 d0c36d47..88131c59 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
@@ -1,3 +1,4 @@
+<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/aaiGetSubs.css" />

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

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

@@ -7,20 +8,22 @@
 <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" />

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

 

 	

 	<script>

 	

 	var appDS2 = app;

 </script>

+

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

 	

 <!-- 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/bootstrap/js/bootstrap.min.js"></script>

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

+<script src="app/vid/external/upload-file/ng-file-upload.min.js"></script>

 

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

 

@@ -33,40 +36,56 @@
 <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/modals/new-test-environment/new-test-environment.controller.js"></script>

+<script src="app/vid/scripts/modals/alert-modal/alert-modal.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>

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

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

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

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

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

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

 <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/AddNetworkNodeController.js"></script>

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

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

+<script src="app/vid/scripts/modals/attach-test-env-manifest/attach-test-env-manifest.controller.js"></script>

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

 

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

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

 

-

+<script src="app/vid/scripts/directives/messageViewer.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/directives/serviceMetadata.js"></script>

+<script src="app/vid/scripts/directives/search.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>

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

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

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

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

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

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

 <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/pnfService.js"></script>

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

+<script src="app/vid/scripts/modals/cancel-pending-workflow/cancel-pending-workflow.controller.js"></script>

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

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

+

+

 

 <%@ page import="org.openecomp.vid.mso.*"%>

 <%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%>

@@ -81,18 +100,20 @@
 	<div ng-view></div>

 </div>

 <!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

-<br>

+<div class="temporary-solution">

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+	<br>

+</div>

diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp
new file mode 100644
index 00000000..ca92b152
--- /dev/null
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/subscriberdetails.jsp
@@ -0,0 +1,184 @@
+<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %>
+<div ng-controller="subscriberDetailsController">
+	<div>
+		<h1 class="heading1" style="margin-top:20px;">Selected Subscriber's Service Instance Details:</h1>
+		<div style="margin-top:30px">
+		 	<table att-table table-data="tableData">
+
+			    <thead  att-table-row type="header">
+					<tr>
+					    <th att-table-header key="viewSubDetails">View/Edit</th>
+						<th att-table-header key="global-customer-id">Global Customer ID</th>
+			            <th att-table-header key="subscriber-name">Subscriber Name</th>        
+			            <th att-table-header key="service-type">Service Type</th>    
+			            <th att-table-header key="service-instance-id">Service Instance ID</th>
+			        </tr>
+			    </thead>
+			    <tbody att-table-row type="body" row-repeat="disData in displayData">
+			        <tr>
+			        <td att-table-body>
+			         <div ng-controller="viewEditSubController">
+    	              <a href="#" ng-click="postsubscriberID(disData.subscriberName)" alt="View/Edit">
+                  	     View/Edit
+	                  </a>
+            	   </div>
+            	   </td>
+		            	<td att-table-body >{{disData.globalCustomerId}}</td>
+		            	<td att-table-body >{{disData.subscriberName}}</td>
+		            	<td att-table-body >{{disData.serviceType}}</td>
+		            	<td att-table-body >{{disData.serviceInstanceId}}</td>
+			        </tr>     
+			    </tbody>	  
+			</table> 
+		</div>
+	</div>	
+	<table><tr>
+	<td>
+	<div ng-controller="searchExistingSIController" align="left" >
+		<button type="submit" ng-click="cancelSubDetails();" att-button
+			btn-type="primary" size="small">Cancel</button>
+	</div>
+	</td></tr>
+	
+	</table>
+	
+</div>
+<!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/25/2016 -->
+
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+		
+<script>
+app.controller("subscriberDetailsController", function ($scope,$http,modalService, $modal) { 
+	$scope.tableData=${model.customerInfo};
+	$scope.displayData= [];
+	$scope.subscriberData=[];
+	$scope.serviceInstanceData= new Array();
+	$scope.globalcustomerid = $scope.tableData['global-customer-id'];
+	$scope.subscriberName = $scope.tableData['subscriber-name'];
+	$scope.subscriberData = $scope.tableData['service-subscriptions'];
+	   
+	 $scope.setDisplaynoSTSI = function(){
+    	 $scope.displayData.push({
+				globalCustomerId : $scope.globalcustomerid,
+			    subscriberName   :  $scope.subscriberName,
+			    serviceType : "No Service Subscription Found",
+			    serviceInstanceId : "No Service Instance Found"
+			});
+     }
+	 
+	 $scope.setDisplaynoSI = function(servcType){
+    	 $scope.displayData.push({
+				globalCustomerId : $scope.globalcustomerid,
+			    subscriberName   :  $scope.subscriberName,
+			    serviceType : servcType,
+			    serviceInstanceId : "No Service Instance Found"
+			});
+     }
+	 
+	if ($scope.subscriberData != null)
+		{
+		    if ($scope.numberofSubscribers = $scope.subscriberData['service-subscription'] != null)
+		    	{
+					$scope.numberofSubscribers = $scope.subscriberData['service-subscription'].length;
+					if ($scope.numberofSubscribers > 0)
+						{
+						    var index = 0;
+							for(i=0; i < $scope.numberofSubscribers; i++) {
+								$scope.serviceInstanceData[i] = new Array();
+								var servicesubscription = $scope.subscriberData['service-subscription'][i]; 
+								$scope.serviceInstanceData[i] = servicesubscription['service-instances'];
+								if ($scope.serviceInstanceData[i] != null)
+									{
+									    if ($scope.serviceInstanceData[i]['service-instance'] != null)
+									    	{
+												var numberofserviceInstance = $scope.serviceInstanceData[i]['service-instance'].length;
+												if (numberofserviceInstance > 0)
+													{
+														for(j=0; j < numberofserviceInstance; j++)
+														{
+															$scope.displayData.push({
+																globalCustomerId : $scope.globalcustomerid,
+															    subscriberName   :  $scope.subscriberName,
+															    serviceType : servicesubscription['service-type'],
+															    serviceInstanceId : $scope.serviceInstanceData[i]['service-instance'][j]['service-instance-id']
+															});
+														}
+													}
+												else
+													{
+													   $scope.setDisplaynoSI(servicesubscription['service-type']);
+													}
+									    	}
+									    else
+										{
+									    	$scope.setDisplaynoSI(servicesubscription['service-type']);
+										}
+									}
+								else
+									{
+									   $scope.setDisplaynoSI(servicesubscription['service-type']);
+									}
+					        }
+						}
+					else
+						{
+						  $scope.setDisplaynoSTSI();
+						}
+		    	}
+		    else
+				{
+		    	   $scope.setDisplaynoSTSI();
+				}
+			}
+		else
+		{
+			 $scope.setDisplaynoSTSI();
+		}
+	
+	
+});
+
+app.controller('viewEditSubController',['$scope','$http',function ($scope,$http) { 
+	
+	$scope.postsubscriberID = function(subID){
+		   $.ajax({
+		            url: "vieweditsub/subedit?"+"subscriberID="+encodeURIComponent(subID),
+	                type : "POST",
+	                success:function (response){
+	                    window.location.href = 'instantiate.htm';
+	                },
+	                error:function( jqXHR, status,error ){
+	                	$("#errorInfo").show();
+	                }
+	                
+	        });
+		}
+	
+}]);
+
+app.controller('searchExistingSIController',['$scope','$http',function ($scope,$http) { 
+	
+	$scope.cancelSubDetails = function(selectedSubscriber){
+ 		
+		window.location.href = 'searchexistingsi.htm';
+		
+	}
+	
+}]);
+</script>
+
+    
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
index 59c8a317..2c802226 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp
@@ -7,7 +7,7 @@
 <link rel="stylesheet" type="text/css" href="app/vid/styles/dialogs.css" />

 

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

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

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

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

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

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

@@ -16,7 +16,7 @@
 <script src="app/vid/scripts/services/asdcService.js"></script>

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

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

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

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

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

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

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

@@ -54,7 +54,7 @@
 	<div popup-window class="popupContents" ngx-show="{{popup.isVisible}}"

 		ng-cloak>

 		<div ng-include="'app/vid/scripts/view-models/creationDialog.htm'"></div>

-		<div ng-include="'app/vid/scripts/view-models/deletionDialog.htm'"></div>

+		<div ng-include="'app/vid/scripts/view-models/deleteResumeDialog.htm'"></div>

 		<div ng-include="'app/vid/scripts/view-models/detailsDialog.htm'"

 			onload="autoStartTest();"></div>

 	</div>

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 ad5331d9..b505909f 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,23 +1,27 @@
 <script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script>

+<script src="app/vid/external/upload-file/ng-file-upload.min.js"></script>

 <div>

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

+     <h1 class="heading1">AT&T Domain 2.0 Network</h1>

      <br>

      <h1 class="heading1"><u>Welcome to VID</u></h1>

      <br>

    The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators 

    to instantiate service instances and their constituent parts for Distributed service models required by the 

-   ONAP service operations that manage them, such as Mobility Network Services, etc. 

-   The models are defined by ONAP component SDC. The service 

+   internal AT&T service operations organizations that manage them, such as Mobility Network Services, 

+   Netbond Services, or FlexReach Services. The models are defined by ECOMP component ASDC. The service 

    deployment operator selects the service operations owner and model that they wish to instantiate. After 

-   entry of appropriate data, the operator instructs VID to direct another ONAP component, MSO, to instantiate 

+   entry of appropriate data, the operator instructs VID to direct another ECOMP component, MSO, to instantiate 

    the selected service model. Once the service instance has been instantiated, the service operator can instruct 

    VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. 

    The VID user can also search for, and display, existing service instances and direct the instantiation of 

    subsequent instance components.

      <br><br>

-  

-    <h1 class="heading1"><a href="mailto:portal@lists.onap.org" target="_top">Contact Us</a></h1>

-    <a href="mailto:portal@lists.onap.org" target="_top">Please click here to contact us.</a>

+   <h1 class="heading1"><u>About VID</u></h1>

+    VID was originally developed for the October 2016 release by an integrated IT and Labs team, under the 

+      direction of Steve Smokowski and Vivian Pressley.

+      <br><br>

+    <h1 class="heading1"><a href="mailto:VID-Tier4@ist.att.com" target="_top">Contact Us</a></h1>

+    <a href="mailto:VID-Tier4@ist.att.com" target="_top">Please click here to contact us.</a>

 

 	

 

@@ -26,6 +30,7 @@
 

 

 </div>

+<!--  Temporary solution for footer overlapping the men after talking to EComp SDK developer on 06/16/2016 -->

 <br>

 <br>

 <br>