Add adapter selection on server page
Change-Id: I27c7256376ff32fe416ca5f63fc92f1f56b18c20
This commit is contained in:
parent
902f491305
commit
36779c99aa
@ -485,4 +485,21 @@ steal("jquery/dom/fixture", "jquery/lang/json", function(){
|
|||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$.fixture('GET /api/adapters', function(original, settings, headers) {
|
||||||
|
console.log("original: ", original);
|
||||||
|
console.log("settings: ", settings);
|
||||||
|
|
||||||
|
var res = {
|
||||||
|
"status": "OK",
|
||||||
|
"adapters": [{
|
||||||
|
"id": 1,
|
||||||
|
"name": "Centos_openstack"
|
||||||
|
}, {
|
||||||
|
"id": 2,
|
||||||
|
"name": "Centos"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
};
|
||||||
|
return res;
|
||||||
|
});
|
||||||
})
|
})
|
||||||
|
@ -113,6 +113,14 @@ steal("jquery/model", "jquery/lang/json",
|
|||||||
success: success,
|
success: success,
|
||||||
error: error
|
error: error
|
||||||
});
|
});
|
||||||
|
},
|
||||||
|
get: function(success, error) {
|
||||||
|
$.ajax({
|
||||||
|
url: '/api/adapters',
|
||||||
|
type: 'get',
|
||||||
|
success: success,
|
||||||
|
error: error
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
|
@ -19,7 +19,8 @@ steal(
|
|||||||
machines: [],
|
machines: [],
|
||||||
switches: [],
|
switches: [],
|
||||||
snmp: true,
|
snmp: true,
|
||||||
adapter_id: null
|
adapter_id: null,
|
||||||
|
adapters: []
|
||||||
};
|
};
|
||||||
|
|
||||||
var state = new $.Observe(odsState);
|
var state = new $.Observe(odsState);
|
||||||
|
@ -36,6 +36,11 @@ steal(
|
|||||||
this.dataTable.fnClearTable();
|
this.dataTable.fnClearTable();
|
||||||
this.dataTable.fnAddData(oldAllServersData);
|
this.dataTable.fnAddData(oldAllServersData);
|
||||||
|
|
||||||
|
for (var i = 0; i < this.options.odsState.adapters.length; i++) {
|
||||||
|
$("#adapter").append("<option value=\"" + this.options.odsState.adapters[i].id + "\">" + this.options.odsState.adapters[i].name + "</option>");
|
||||||
|
}
|
||||||
|
$('#adapter').val(String(this.options.odsState.adapter_id));
|
||||||
|
|
||||||
var oldSelectedServersData = this.options.odsState.servers;
|
var oldSelectedServersData = this.options.odsState.servers;
|
||||||
|
|
||||||
for (var i = 0; i < oldSelectedServersData.length; i++) {
|
for (var i = 0; i < oldSelectedServersData.length; i++) {
|
||||||
@ -47,6 +52,10 @@ steal(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
this.countCheckedServers();
|
this.countCheckedServers();
|
||||||
|
} else {
|
||||||
|
// get adapters
|
||||||
|
this.adapters = [];
|
||||||
|
Ods.Adapter.get(this.proxy('onGetAdapters'), this.proxy('onGetAdaptersErr'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -79,7 +88,6 @@ steal(
|
|||||||
"serverControl": this
|
"serverControl": this
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
dataTableIpAddrSort: function() {
|
dataTableIpAddrSort: function() {
|
||||||
@ -203,14 +211,14 @@ steal(
|
|||||||
this.options.odsState.machines = this.dataTable.fnGetData();
|
this.options.odsState.machines = this.dataTable.fnGetData();
|
||||||
|
|
||||||
if (this.initServerStep) {
|
if (this.initServerStep) {
|
||||||
|
this.options.odsState.adapter_id = parseInt($("#adapter").val());
|
||||||
// create cluster
|
// create cluster
|
||||||
Ods.Cluster.create({
|
Ods.Cluster.create({
|
||||||
"cluster": {
|
"cluster": {
|
||||||
"name": "",
|
"name": "",
|
||||||
"adapter_id": 1
|
"adapter_id": this.options.odsState.adapter_id
|
||||||
}
|
}
|
||||||
}, this.proxy('onClusterCreated'), this.proxy('onClusterCreatedErr'));
|
}, this.proxy('onClusterCreated'), this.proxy('onClusterCreatedErr'));
|
||||||
this.options.odsState.adapter_id = 1;
|
|
||||||
} else {
|
} else {
|
||||||
// replace all hosts in current cluster
|
// replace all hosts in current cluster
|
||||||
var cluster_id = this.options.odsState.cluster_id;
|
var cluster_id = this.options.odsState.cluster_id;
|
||||||
@ -222,6 +230,30 @@ steal(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/************************************/
|
||||||
|
// get adapters success callback
|
||||||
|
/************************************/
|
||||||
|
'onGetAdapters': function(data, textStatus, xhr) {
|
||||||
|
if (xhr.status == 200) {
|
||||||
|
this.adapters = data.adapters;
|
||||||
|
this.options.odsState.adapters = data.adapters;
|
||||||
|
if (this.adapters.length > 0) {
|
||||||
|
for (var i = 0; i < this.adapters.length; i++) {
|
||||||
|
$("#adapter").append("<option value=\"" + this.adapters[i].id + "\">" + this.adapters[i].name + "</option>");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$("#adapter").append("<option value='-1'>Not Available</option>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
/************************************/
|
||||||
|
// get adapters error callback
|
||||||
|
/************************************/
|
||||||
|
'onGetAdaptersErr': function(xhr, status, statusText) {
|
||||||
|
$("#adapter").append("<option value='-1'>Not Available</option>");
|
||||||
|
},
|
||||||
|
|
||||||
/************************************/
|
/************************************/
|
||||||
// create cluster success callback
|
// create cluster success callback
|
||||||
/************************************/
|
/************************************/
|
||||||
|
@ -54,6 +54,9 @@
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<br>
|
<br>
|
||||||
|
<div class='float_left rounded server-selection-num'>
|
||||||
|
Adapter: <select id="adapter"></select>
|
||||||
|
</div>
|
||||||
<div class='float_right rounded server-selection-num'>
|
<div class='float_right rounded server-selection-num'>
|
||||||
<span id="selected_num">0</span> items selected
|
<span id="selected_num">0</span> items selected
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user