GabrielBrascher closed pull request #2748: Warn Basic network end of life
URL: https://github.com/apache/cloudstack/pull/2748
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index d68b4f8c3cf..045f23b5ee1 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -13360,3 +13360,9 @@ div.panel.copy-template-destination-list div.list-view
div.fixed-header{
left: 310px;
}
+.basic-zone-alert {
+ padding: 5px;
+ background-color: #f44336;
+ color: white;
+ visibility: visible;
+}
diff --git a/ui/index.html b/ui/index.html
index 5003f00b369..7f64c88ff4b 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -649,6 +649,9 @@ <h3><translate key="label.set.up.zone.type"/></h3>
<input type="radio"
name="network-model" value="Basic" checked="checked" />
<label><translate
key="label.basic"/></label>
</div>
+ <div class="basic-zone-alert">
+ <translate key="label.basic.warn.eol"/>
+ </div>
<div class="select-area advanced-zone
disabled">
<div class="desc">
<translate
key="message.desc.advanced.zone"/>
diff --git a/ui/l10n/en.js b/ui/l10n/en.js
index 86a860616e0..d8e984455ed 100644
--- a/ui/l10n/en.js
+++ b/ui/l10n/en.js
@@ -471,6 +471,8 @@ var dictionary = {"ICMP.code":"ICMP Code",
"label.baremetal.pxe.provider":"Baremetal PXE Provider",
"label.baremetal.rack.configuration":"Baremetal Rack Configuration",
"label.basic":"Basic",
+"label.basic.warn.eol":"The Basic network will not be supported on Apache
CloudStack 5.0",
+"label.basic.warn.eol.intro":"Before proceeding to the next step, be warned
that the Basic network will not be supported on Apache CloudStack 5.0.
Therefore, this basic installation will create a zone that will not be
supported on Apache CloudStack 5.0",
"label.basic.mode":"Basic Mode",
"label.bigswitch.bcf.details":"BigSwitch BCF details",
"label.bigswitch.bcf.nat":"BigSwitch BCF NAT Enabled",
diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js
index ccfa59ae7d3..fd1bc3d9544 100644
--- a/ui/l10n/pt_BR.js
+++ b/ui/l10n/pt_BR.js
@@ -465,6 +465,7 @@ var dictionary = {
"label.baremetal.pxe.provider": "Provedor PXE Baremetal",
"label.baremetal.rack.configuration": "Configuração do Rack de Baremetal",
"label.basic": "Básico",
+ "label.basic.warn.eol":"Redes do tipo Básico não serão mais suportadas
pelo Apache CloudStack 5.0",
"label.basic.mode": "Modo Básico",
"label.bigswitch.bcf.details": "Detalhes do BigSwitch BCF",
"label.bigswitch.bcf.nat": "Habilitar BigSwitch BCF NAT",
diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js
index 9d7c23da476..83063253c4d 100644
--- a/ui/scripts/installWizard.js
+++ b/ui/scripts/installWizard.js
@@ -215,6 +215,12 @@
text: 'message.installWizard.copy.whatIsAZone'
});
},
+
+ warnBasicNetworkEol: function(args) {
+ args.response.success({
+ text: 'label.basic.warn.eol.intro'
+ });
+ },
whatIsAPod: function(args) {
args.response.success({
diff --git a/ui/scripts/ui-custom/installWizard.js
b/ui/scripts/ui-custom/installWizard.js
index f7ed074e774..e97bf05e193 100644
--- a/ui/scripts/ui-custom/installWizard.js
+++ b/ui/scripts/ui-custom/installWizard.js
@@ -324,7 +324,7 @@
var $advanced =
elems.nextButton(_l('label.skip.guide')).addClass('advanced-installation');
$continue.click(function() {
- goTo('changeUser');
+ goTo('warnBasicNetworkEol');
return false;
});
@@ -405,7 +405,19 @@
return $changeUser;
},
-
+
+ /**
+ * Warns Basic network end of life
+ */
+ warnBasicNetworkEol: elems.stepIntro({
+ title: _l('label.installWizard.addZoneIntro.title'),
+ subtitle: _l('label.basic.warn.eol'),
+ copyID: 'warnBasicNetworkEol',
+ prevStepID: 'intro',
+ nextStepID: 'changeUser',
+ diagram: '.part.zone'
+ }),
+
/**
* Add zone intro text
* @param args
diff --git a/ui/scripts/ui-custom/zoneWizard.js
b/ui/scripts/ui-custom/zoneWizard.js
index 9ae599b7e5b..73279263be2 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -1303,10 +1303,14 @@
var $selectArea = $target.closest('.select-area');
if ($target.val() == 'Advanced') {
+ $(".basic-zone-alert").css( "visibility",
"hidden");
+
$inputs.attr('disabled', false);
$selectArea.removeClass('disabled')
.find('.isolation-mode
input').attr('disabled', false);
} else if ($target.val() == 'Basic') {
+ $(".basic-zone-alert").css( "visibility",
"visible");
+
$selectArea.siblings('.advanced-zone').addClass('disabled')
.find('.isolation-mode
input').attr('disabled', 'disabled');
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
