diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index f16b69d3eb3..2dd49c70aaf 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -17,7 +17,7 @@ label.by.domain=By Domain label.by.account=By Account label.by.start.date=By Start Date label.by.end.date=By End Date - +message.no.network.support.configuration.not.true=direct.attach.security.groups.enabled is not set to true. Thus, no additional network features. Please continue to step 5. #Labels label.account.id=Account ID diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index 5a92ecea8cd..bba838e90cd 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -693,7 +693,8 @@ dictionary = {
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index 5c73c227e26..556a6816b55 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1015,16 +1015,25 @@ function initVMWizard() { } else { // Basic Network $thisPopup.find("#step4").find("#for_advanced_zone").hide(); - if(getDirectAttachSecurityGroupsEnabled() == "true" && $selectedVmWizardTemplate.data("hypervisor") != "VMware" ) { + if($selectedVmWizardTemplate.data("hypervisor") != "VMware" && getDirectAttachSecurityGroupsEnabled() == "true") { $thisPopup.find("#step4").find("#for_basic_zone").show(); $thisPopup.find("#step4").find("#for_no_network_support").hide(); - $thisPopup.find("#step4").find("#security_group_section").show(); - $thisPopup.find("#step4").find("#not_available_message").hide(); + $thisPopup.find("#step4").find("#security_group_section").show(); $thisPopup.find("#step5").find("#wizard_review_network").text("Basic Network"); } else { $thisPopup.find("#step4").find("#for_basic_zone").hide(); - $thisPopup.find("#step4").find("#for_no_network_support").show(); + + $thisPopup.find("#step4").find("#for_no_network_support").show(); + if($selectedVmWizardTemplate.data("hypervisor") == "VMware") { + $thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_1").show(); + $thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_2").hide(); + } + else if(getDirectAttachSecurityGroupsEnabled() != "true") { + $thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_1").hide(); + $thisPopup.find("#step4").find("#for_no_network_support").find("#not_available_message_2").show(); + } + $thisPopup.find("#step5").find("#wizard_review_network").text("Basic Network"); } }