From 3155b2fa811f920770543551fd232be8caf38ca0 Mon Sep 17 00:00:00 2001 From: Erik Munson Date: Tue, 16 Jan 2018 08:23:20 -0800 Subject: [PATCH] feat(amazon/serverGroup): warn that scaling policies will not work when capacity is pinned (#4668) --- .../resize/resizeCapacity.component.html | 17 ++++++++++++++++- .../details/resize/resizeCapacity.component.ts | 3 ++- .../details/resize/resizeServerGroup.html | 3 ++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.html b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.html index 1b93d4dab8f..3c2ebe9a7c6 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.html @@ -48,7 +48,6 @@ min="{{$ctrl.command.min}}" max="{{$ctrl.command.max}}"/> -
@@ -86,3 +85,19 @@
+
+
+
+ Warning: this server group has + a scaling policy. + scaling policies. + + Scaling policies will not take effect in Simple Mode. + Switch to Advanced Mode. + + + Scaling policies will not take effect when Min is the same as Max. + +
+
+
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.ts b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.ts index 5d91c5fc72c..7bc77fcb125 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.ts +++ b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.component.ts @@ -3,7 +3,8 @@ import { IComponentOptions, module } from 'angular'; const resizeCapacityComponent: IComponentOptions = { bindings: { command: '=', - currentSize: '=' + currentSize: '=', + serverGroup: '=' }, templateUrl: require('./resizeCapacity.component.html'), controller: () => {} diff --git a/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.html index 37ac47f5e32..e5317e853f2 100644 --- a/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.html +++ b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.html @@ -7,7 +7,8 @@

Resize {{serverGroup.name}}