diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js
index 589c397de..a3281f65a 100644
--- a/xCAT-UI/js/custom/hmc.js
+++ b/xCAT-UI/js/custom/hmc.js
@@ -489,7 +489,7 @@ function powerInitBasicPattern() {
var showString = '
' + steps[currentStep] + '
';
showString += '
';
$('#discoverContentDiv').append(showString);
@@ -603,6 +616,30 @@ function checkBasicPattern(operType) {
if (!frameNumPerHmc) {
errMessage += 'Input the Frame Number Per HMC.
';
}
+
+ if (!getDiscoverEnv('vlan1ip')){
+ errMessage += 'Input the Vlan 1 IP Header.
';
+ }
+
+ if (!getDiscoverEnv('vlan2ip')){
+ errMessage += 'Input the Vlan 2 IP Header.
';
+ }
+
+ if (!getDiscoverEnv('lparstartip')){
+ errMessage += 'Input the Lpars\' Starting IP Adress.
';
+ }
+
+ if (!getDiscoverEnv('hmcstartip')){
+ errMessage += 'Input the HMCs\' Starting IP Adress.
';
+ }
+
+ if (!getDiscoverEnv('framepbb')){
+ errMessage += 'Input the Frame amount per BB.
';
+ }
+
+ if (!getDiscoverEnv('cecpbb')){
+ errMessage += 'Input the CEC amount per BB
';
+ }
// Hardware management type is HMC
if ('hmc' == $('#discoverContentDiv :checked').attr('value')) {
@@ -628,7 +665,7 @@ function checkBasicPattern(operType) {
}
}
- if ((Number(lparNumPerCec) * cecNum) != lparNum) {
+ if ((Number(lparNumPerCec) * cecNum) > lparNum) {
errMessage += 'The number of Lpars calculate by Name Range should be '
+ Number(lparNumPerCec) * cecNum
+ '("the number of Drawers" * "the number of lpar per drawer")';
@@ -724,16 +761,6 @@ function checkSupernode(operType) {
return false;
}
- var cecArray = expandNR(getDiscoverEnv('cecName'));
- if (eceNum != cecArray.length) {
- errString += 'The number of CEC calculated from supernode configure is '
- + eceNum + ', but the number ' + 'calculated from CECs\' Name Range is ' + cecArray.length
- + '. Reconfigure the supernode please.';
- warnBar = createWarnBar(errString);
- $('#supernodeDiv').prepend(warnBar);
- return false;
- }
-
$.ajax({
url : 'lib/cmd.php',
dataType : 'json',