mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-23 05:04:56 +09:00
* F #3440: Refactor host.rb Refactor host.rb using classes: NSXClient TransportZone * Error corrections * M #3440: Added forgotten sleep * M #3440: Change require order in nsx_driver Change require order in NSX Driver to avoid the inclussion of additional requires. * F #3440: NSX add form in vnets Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: add action NSX Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: add form set user and password Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: add form NSX-V in vnet (create) Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: fix form NSX-V in vnet (create) Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: clear form NSX-V in vnet (create) Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: add form NSX-T in vnet (create) Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: Submit action NSX (vnet create) Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * F #3440: fix error show nsx-t form Signed-off-by: Jorge Lobo <jlobo@opennebula.systems> * Delete sshuttle.pid
This commit is contained in:
1 parent
72e0b2e580
commit
3b8bf172f3
1 file changed
+7
-5
@@ -432,6 +432,8 @@ define(function(require) {
|
||||
var label = $("<label/>");
|
||||
var input = $("<input/>");
|
||||
var element = $("<option/>");
|
||||
var type_nsxt = "Opaque Network";
|
||||
|
||||
nsx_type.empty().append(element.clone().text("--"));
|
||||
if (!(hosts instanceof Array)) {
|
||||
hosts = [hosts];
|
||||
@@ -443,7 +445,7 @@ define(function(require) {
|
||||
var instanciate_id = host && host.TEMPLATE && host.TEMPLATE.VCENTER_INSTANCE_ID || "";
|
||||
var id = (host && host.ID) || 0;
|
||||
if(type_nsx && instanciate_id){
|
||||
type_nsx = type_nsx.toLowerCase() === "nsx-t"? "Opaque Network" : type_nsx;
|
||||
type_nsx = type_nsx.toLowerCase() === "nsx-t"? type_nsxt : type_nsx;
|
||||
var option = element.clone();
|
||||
option.val(type_nsx);
|
||||
option.attr({"data-id":id, "data-instance": instanciate_id});
|
||||
@@ -452,6 +454,7 @@ define(function(require) {
|
||||
}
|
||||
});
|
||||
nsx_type.off().on('change', function(){
|
||||
$("div.network_mode_description").hide();
|
||||
var optionSelected = $(this).find("option:selected");
|
||||
var selectId = optionSelected.attr("data-id");
|
||||
var instanceId = optionSelected.attr("data-instance");
|
||||
@@ -480,7 +483,6 @@ define(function(require) {
|
||||
maclearning: 'nsx-maclearning',
|
||||
adminstatus: 'nsx-adminstatus'
|
||||
};
|
||||
|
||||
switch (type.toLowerCase()) {
|
||||
case 'nsx-v':
|
||||
//NSX-V
|
||||
@@ -522,7 +524,7 @@ define(function(require) {
|
||||
);
|
||||
nsx_fields.append(replication.add(universalSync).add(ipDiscover).add(macLearning));
|
||||
break;
|
||||
case 'nsx-t':
|
||||
case type_nsxt.toLowerCase():
|
||||
//NSX-T
|
||||
var adminStatusInput = input.clone().attr({type:'radio', name: idInputs.adminstatus, id: idInputs.adminstatus});
|
||||
var inputRep = input.clone().attr({type:'radio', name: idInputs.replication, id: idInputs.replication});
|
||||
@@ -568,8 +570,8 @@ define(function(require) {
|
||||
}
|
||||
}
|
||||
},
|
||||
error: function(){
|
||||
console.log("ERROR");
|
||||
error: function(error){
|
||||
console.log("ERROR", error);
|
||||
}
|
||||
};
|
||||
OpenNebulaAction.list(hostActions,actionHost);
|
||||
|
||||
Reference in new issue
Block a user