summaryrefslogtreecommitdiffstats
path: root/portal/src/main
diff options
context:
space:
mode:
authorLi Zi <li.zi30@zte.com.cn>2017-10-13 10:34:56 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-13 10:34:56 +0000
commitb4fbc4cb55dd975dcd6148b3d73b6f02191c43cd (patch)
treecff7fccd21a953b35814699c9150fa0ebe9c62dc /portal/src/main
parent7fabfb85c3493de9c58bb782e46fe71aa0bf543c (diff)
parent305f0c86015a4443fb75197022d4f6d9c16a11d4 (diff)
Merge "Add default tenant as input of VIM."
Diffstat (limited to 'portal/src/main')
-rw-r--r--portal/src/main/webapp/extsys/vim/js/vimController.js4
-rw-r--r--portal/src/main/webapp/extsys/vim/vimView.html30
2 files changed, 23 insertions, 11 deletions
diff --git a/portal/src/main/webapp/extsys/vim/js/vimController.js b/portal/src/main/webapp/extsys/vim/js/vimController.js
index 6bd6961..fec057b 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": ""
}
]
},
@@ -259,6 +260,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 b0623ef..10f1bc4 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-->