From: Luji7 <lu.ji3@zte.com.cn>
Date: Sun, 18 Sep 2016 05:54:00 +0000 (+0800)
Subject: lcm gui integration
X-Git-Tag: release/sun~214
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=332febfadf4ff8b777d5f58f0e68c0287a515afe;p=vnfsdk%2Frefrepo.git

lcm gui integration

Change-Id: I9899953757a2efa0a7aa7212cd205c6a8ec161d6
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
---

diff --git a/openo-portal/portal-lifecyclemgr/gsolcmmain.html b/openo-portal/portal-lifecyclemgr/gsolcmmain.html
index 0067c311..715f8616 100644
--- a/openo-portal/portal-lifecyclemgr/gsolcmmain.html
+++ b/openo-portal/portal-lifecyclemgr/gsolcmmain.html
@@ -29,6 +29,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>	
 	<script type="text/javascript" src="js/rest.js"></script>
 	<script type="text/javascript" src="js/bootstrap-table.min.js"></script>
+	<script type="text/javascript" src="gsolcm.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function() {
 		var jsondata = [];
@@ -37,8 +38,9 @@
 		//Assigning data to table
 		data: jsondata
 		});
-       
+		new lcmHandler();
     });	
+    
 	function operateFormatter(value, row, index) {
         return [
             '<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />'
@@ -150,41 +152,46 @@
 								</ul>
 								<div class="tab-content">
 								<ul class="nav nav-tabs">
-								  <li><a href="#">Basic Info</a>
- 									<div class="tab-pane active" id="basicTab">
-										<div class="form-group" ms-class="has-error:vmAppDialog.name==''">
-											<label class="col-sm-3 control-label">
-												<span>Service Name</span>
-												<span class="required">*</span>
-											</label>
-											<div class="col-sm-7">
-												<input type="text" id="svcName" name="svcName" class="form-control" placeholder="Service Name"/> 
+										<li class="active"><a id= "basicInfoTab" href="#basicTab" data-toggle="tab">Basic Info</a></li>	
+										<li ><a id="parameterTabHeader" href="#parameterTab" data-toggle="tab">Template Parameters</a></li>
+									</ul>	
+									<div id="myTabContent" class="tab-content" >
+	 									<div class="tab-pane active" id="basicTab">
+											<div class="form-group" ms-class="has-error:vmAppDialog.name==''">
+												<label class="col-sm-3 control-label">
+													<span>Service Name</span>
+													<span class="required">*</span>
+												</label>
+												<div class="col-sm-7">
+													<input type="text" id="svcName" name="svcName" class="form-control" placeholder="Service Name"/> 
+												</div>
 											</div>
-										</div>
-										<div class="form-group">
-											<label class="col-sm-3 control-label">
-												<span>Service  Description</span>&nbsp;&nbsp;&nbsp;
-											</label>
-										 	<div class="col-sm-7">
-												<input type="text" id="svcDesc" name="svcDesc" class="form-control" placeholder="Service  Description"/>
+											<div class="form-group">
+												<label class="col-sm-3 control-label">
+													<span>Service  Description</span>&nbsp;&nbsp;&nbsp;
+												</label>
+											 	<div class="col-sm-7">
+													<input type="text" id="svcDesc" name="svcDesc" class="form-control" placeholder="Service  Description"/>
+												</div>
+											</div>										
+											<div class="form-group" ms-class="has-error:vmAppDialog.name==''">
+												<label class="col-sm-3 control-label">
+													<span>Service Template</span>
+													<span class="required">*</span>
+												</label>
+												<div class="col-sm-7">
+													<select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" id="svcTempl" 
+													        name="svcTempl">
+														<option value="1.1">1.1</option>
+														<option value="1.2">1.2</option>
+													</select>
+												</div>
 											</div>
-										</div>										
-										<div class="form-group" ms-class="has-error:vmAppDialog.name==''">
-											<label class="col-sm-3 control-label">
-												<span>Service Template</span>
-												<span class="required">*</span>
-											</label>
-											<div class="col-sm-7">
-												<select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" id="svcTempl" 
-												        name="svcTempl">
-													<option value="1.1">1.1</option>
-													<option value="1.2">1.2</option>
-												</select>
-											</div>
-										</div>
-									</div>	
-								  </li>	
-							</ul>								  
+										</div>	
+									  	<div class="tab-pane" id="parameterTab"> 
+									  		
+									  	</div>
+									</div>						  
 								</div>
 							</div>
 							<div class="modal-footer">							
diff --git a/openo-portal/portal-lifecyclemgr/js/rest.js b/openo-portal/portal-lifecyclemgr/js/rest.js
index a5d83f83..c27dbf07 100644
--- a/openo-portal/portal-lifecyclemgr/js/rest.js
+++ b/openo-portal/portal-lifecyclemgr/js/rest.js
@@ -78,29 +78,4 @@ $(function(){
 			return o;
 			};
 	
-$('#createNS').click(function(){
-				var formData = JSON.stringify($("#neForm").serializeObject());
-				var jsonobj = JSON.parse(formData);
-		        var newJson = {"managedElement": jsonobj};
-		        formData = JSON.stringify(newJson);
-		        var requestUrl = "http://localhost:8080/org.openo.sdno.brs/openoapi/sdnobrs/v1/managed-elements";
-		        $
-				.ajax({
-					type : "POST",
-					url : requestUrl,
-					contentType : "application/json",
-					dataType : "json",
-					data : formData,
-					success : function(jsonResp) {
-						alert("NS saved successfully!!!");
-						jsonobj["id"]= jsonResp.managedElement.id;
-						$('#ne').bootstrapTable("append", jsonobj);
-						$('#vmAppDialog').removeClass('in').css('display','none');
-
-					},
-					error : function(xhr, ajaxOptions, thrownError) {
-						alert("Error on page : " + xhr.responseText); 	
-					}
-				});
-			});
 })
\ No newline at end of file