fix e2e service template bug for ns detail show

Change-Id: I53f0f8273fac3f6e26b69c98882cd78ebe262d6d
Issue-ID: USECASEUI-115
Signed-off-by: zhangab <zhanganbing@chinamobile.com>

1 files changed, 22 insertions, 19 deletions

diff --git a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html
index 263656f5..810fe81f 100644
--- a/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html
+++ b/usecaseui-lcm/src/main/webapp/app/uui/fusion/scripts/view-models/create-service-dialog.html
@@ -60,24 +60,7 @@
     </uib-tab>
     <uib-tab heading="Template Parameters">
       <div id='templateParasTab' style="margin-top:20px;">
-        <div ng-repeat="parameter in ctrl.service.parameters" class="mT15 form-group" style="margin-left:0px;">
-          <label class="col-sm-5 control-label">
-            <span>{{parameter.name}}</span><span ng-if="parameter.isRequired" class="required">*</span>
-          </label>
-          <div ng-if="parameter.type === 'string' || parameter.type === 'boolean' || parameter.type === 'integer'" class="col-sm-5">
-            <input type="text"  name="{{parameter.description}}" class="form-control" ng-model="parameter.value" placeholder="{{parameter.name}}" value="{{parameter.defaultValue}}" ng-readonly="{{parameter.readonly}}"/>
-          </div>
-          <div ng-if="parameter.type === 'vf_location'" class="col-sm-5">
-            <select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" ng-model="parameter.value" ng-options="option.value for option in ctrl.locations">
-              <option value="">--select--</option>
-            </select>
-          </div>
-          <div ng-if="parameter.type === 'sdn_controller'" class="col-sm-5">
-            <select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" ng-model="parameter.value" ng-options="option.value for option in ctrl.sdnControllers">
-              <option value="">--select--</option>
-            </select>
-          </div>
-        </div>
+
         <fieldset ng-repeat="segment in ctrl.service.segments" style="margin-left:25px;">
           <legend>{{segment.nodeTemplateName}}</legend>
           <!-- <div class="form-group" style="margin-left:0px;margin-bottom:5px;">
@@ -101,7 +84,7 @@
               <input type="text"  name="{{segment_parameter.description}}" class="form-control" ng-model="segment_parameter.value" placeholder="{{segment_parameter.name}}" value="{{segment_parameter.defaultValue}}" ng-readonly="{{segment_parameter.readonly}}"/>
             </div>
             <div ng-if="segment_parameter.type === 'vf_location'" class="col-sm-5">
-              <select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" ng-model="segment_parameter.value" ng-options="option.value for option in ctrl.locations">
+              <select class="form-control" style ="padding-top: 1px;padding-bottom: 0px;" ng-model="segment_parameter.value" ng-options="option.name for option in ctrl.locations">
                 <option value="">--select--</option>
               </select>
             </div>
@@ -112,6 +95,26 @@
             </div>
           </div>
         </fieldset>
+          <legend>Service Inputs</legend>
+        <div ng-repeat="parameter in ctrl.service.parameters" class="mT15 form-group" style="margin-left:0px;">
+          <label class="col-sm-5 control-label">
+            <span>{{parameter.name}}</span><span ng-if="parameter.isRequired" class="required">*</span>
+          </label>
+          <div ng-if="parameter.type === 'string' || parameter.type === 'boolean' || parameter.type === 'integer'" class="col-sm-5">
+            <input type="text"  name="{{parameter.description}}" class="form-control" ng-model="parameter.value" placeholder="{{parameter.name}}" value="{{parameter.defaultValue}}" ng-readonly="{{parameter.readonly}}"/>
+          </div>
+          <div ng-if="parameter.type === 'vf_location'" class="col-sm-5">
+            <select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" ng-model="parameter.value" ng-options="option.name for option in ctrl.locations">
+              <option value="">--select--</option>
+            </select>
+          </div>
+          <div ng-if="parameter.type === 'sdn_controller'" class="col-sm-5">
+            <select class="form-control" style ="padding-top: 0px;padding-bottom: 0px;" ng-model="parameter.value" ng-options="option.value for option in ctrl.sdnControllers">
+              <option value="">--select--</option>
+            </select>
+          </div>
+        </div>
+
       </div>
     </uib-tab>
   </uib-tabset>