From: lizi <li.zi30@zte.com.cn>
Date: Fri, 13 Oct 2017 09:28:46 +0000 (+0800)
Subject: Add default tenant as input of VIM.
X-Git-Tag: v1.0.0~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=305f0c86015a4443fb75197022d4f6d9c16a11d4;p=aai%2Fesr-gui.git

Add default tenant as input of VIM.

Add default tenant as input of VIM. Zoom out the input box of extra info.

Change-Id: Ib43be6fe985e346435fface6811009e74ffcc1a7
Issue-ID: AAI-435
Signed-off-by: lizi <li.zi30@zte.com.cn>
---

diff --git a/portal/src/main/webapp/extsys/vim/js/vimController.js b/portal/src/main/webapp/extsys/vim/js/vimController.js
index e9fd644..ead5c2a 100644
--- a/portal/src/main/webapp/extsys/vim/js/vimController.js
+++ b/portal/src/main/webapp/extsys/vim/js/vimController.js
@@ -40,7 +40,8 @@ var vm = avalon
                     "authUrl": "",
                     "sslCacert": "",
                     "sslInsecure": "false",
-                    "cloudDomain": ""
+                    "cloudDomain": "",
+                    "defaultTenant": ""
                 }
             ]
         },
@@ -233,6 +234,7 @@ var vm = avalon
             targetElement["vimAuthInfos"][0]["sslCacert"] = sourceElement["vimAuthInfos"][0]["sslCacert"];
             targetElement["vimAuthInfos"][0]["sslInsecure"] = sourceElement["vimAuthInfos"][0]["sslInsecure"];
             targetElement["vimAuthInfos"][0]["cloudDomain"] = sourceElement["vimAuthInfos"][0]["cloudDomain"];
+            targetElement["vimAuthInfos"][0]["defaultTenant"] = sourceElement["vimAuthInfos"][0]["defaultTenant"];
         },
         getVIMSave: function () {
             var vimSave = $.extend(true, {}, vm.currentElement.$model);
diff --git a/portal/src/main/webapp/extsys/vim/vimView.html b/portal/src/main/webapp/extsys/vim/vimView.html
index c75cdee..12dfc7d 100644
--- a/portal/src/main/webapp/extsys/vim/vimView.html
+++ b/portal/src/main/webapp/extsys/vim/vimView.html
@@ -124,16 +124,7 @@
                                     <span class="help-block"></span>
                                 </div>
                             </div>
-                            <div class="form-group">
-                                <label class="control-label col-sm-3">
-                                    <span>Cloud Extra Info</span>
-                                    <span class="required" aria-required="true">*</span>
-                                </label>
-                                <div class="col-sm-7">
-                                    <input type="text" ms-duplex="currentElement['cloudExtraInfo']" name="cloudExtraInfo" class="form-control"/>
-                                    <span class="help-block"></span>
-                                </div>
-                            </div>
+                            
                             <div class="form-group">
                                 <label class="control-label col-sm-3">
                                     <span>username</span>
@@ -191,6 +182,25 @@
                                     <span class="help-block"></span>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3">
+                                    <span>Default Tenant</span>
+                                </label>
+                                <div class="col-sm-7">
+                                    <input type="text" ms-duplex="currentElement['vimAuthInfos'][0]['defaultTenant']" name="defaultTenant" class="form-control"/>
+                                    <span class="help-block"></span>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3">
+                                    <span>Cloud Extra Info</span>
+                                </label>
+                                <div class="col-sm-7">
+                                    <textarea class="form-control" rows="3" ms-duplex="currentElement['cloudExtraInfo']"
+                                              name="cloudExtraInfo"></textarea>
+                                    <span class="help-block"></span>
+                                </div>
+                            </div>
                         </form>
                     </div>
                     <!-- modal body end-->