Просмотр исходного кода

Update ScalingConfig parameters.

sdk-team 5 лет назад
Родитель
Сommit
cc8cf316cd
79 измененных файлов с 1013 добавлено и 1360 удалено
  1. 3 0
      CHANGELOG
  2. 4 16
      ess/CMakeLists.txt
  3. 8 32
      ess/include/alibabacloud/ess/EssClient.h
  4. 3 0
      ess/include/alibabacloud/ess/model/AttachDBInstancesRequest.h
  5. 3 0
      ess/include/alibabacloud/ess/model/AttachDBInstancesResult.h
  6. 3 0
      ess/include/alibabacloud/ess/model/AttachLoadBalancersResult.h
  7. 3 0
      ess/include/alibabacloud/ess/model/AttachVServerGroupsResult.h
  8. 3 0
      ess/include/alibabacloud/ess/model/CompleteLifecycleActionResult.h
  9. 0 13
      ess/include/alibabacloud/ess/model/CreateAlarmResult.h
  10. 27 0
      ess/include/alibabacloud/ess/model/CreateLifecycleHookResult.h
  11. 6 0
      ess/include/alibabacloud/ess/model/CreateScalingConfigurationResult.h
  12. 6 0
      ess/include/alibabacloud/ess/model/CreateScalingGroupResult.h
  13. 0 67
      ess/include/alibabacloud/ess/model/CreateScalingRuleResult.h
  14. 1 0
      ess/include/alibabacloud/ess/model/DescribeAlarmsRequest.h
  15. 0 57
      ess/include/alibabacloud/ess/model/DescribeAlertConfigRequest.h
  16. 0 55
      ess/include/alibabacloud/ess/model/DescribeAlertConfigResult.h
  17. 0 69
      ess/include/alibabacloud/ess/model/DescribeCapacityHistoryRequest.h
  18. 21 9
      ess/include/alibabacloud/ess/model/DescribeLifecycleActionsRequest.h
  19. 19 19
      ess/include/alibabacloud/ess/model/DescribeLifecycleActionsResult.h
  20. 29 16
      ess/include/alibabacloud/ess/model/DescribeLifecycleHooksRequest.h
  21. 2 0
      ess/include/alibabacloud/ess/model/DescribeScalingGroupsRequest.h
  22. 5 4
      ess/include/alibabacloud/ess/model/DescribeScalingInstancesRequest.h
  23. 2 0
      ess/include/alibabacloud/ess/model/DescribeScalingRulesRequest.h
  24. 3 0
      ess/include/alibabacloud/ess/model/DescribeScheduledTasksRequest.h
  25. 3 0
      ess/include/alibabacloud/ess/model/DescribeScheduledTasksResult.h
  26. 3 0
      ess/include/alibabacloud/ess/model/DetachDBInstancesResult.h
  27. 3 0
      ess/include/alibabacloud/ess/model/DetachInstancesResult.h
  28. 3 0
      ess/include/alibabacloud/ess/model/DetachLoadBalancersResult.h
  29. 9 6
      ess/include/alibabacloud/ess/model/DetachVServerGroupsResult.h
  30. 9 6
      ess/include/alibabacloud/ess/model/EnterStandbyResult.h
  31. 3 0
      ess/include/alibabacloud/ess/model/ExitStandbyResult.h
  32. 0 66
      ess/include/alibabacloud/ess/model/ModifyAlarmResult.h
  33. 0 49
      ess/include/alibabacloud/ess/model/ModifyAlertConfigResult.h
  34. 27 0
      ess/include/alibabacloud/ess/model/ModifyLifecycleHookRequest.h
  35. 6 0
      ess/include/alibabacloud/ess/model/ModifyScalingConfigurationResult.h
  36. 6 0
      ess/include/alibabacloud/ess/model/ModifyScalingGroupResult.h
  37. 9 6
      ess/include/alibabacloud/ess/model/ModifyScalingRuleResult.h
  38. 9 6
      ess/include/alibabacloud/ess/model/SetInstancesProtectionRequest.h
  39. 3 0
      ess/include/alibabacloud/ess/model/VerifyAuthenticationRequest.h
  40. 9 117
      ess/include/alibabacloud/ess/model/VerifyAuthenticationResult.h
  41. 11 0
      ess/src/model/AttachDBInstancesRequest.cc
  42. 11 0
      ess/src/model/AttachDBInstancesResult.cc
  43. 11 0
      ess/src/model/AttachLoadBalancersResult.cc
  44. 11 0
      ess/src/model/AttachVServerGroupsResult.cc
  45. 11 0
      ess/src/model/CompleteLifecycleActionResult.cc
  46. 0 20
      ess/src/model/CreateAlarmResult.cc
  47. 99 0
      ess/src/model/CreateLifecycleHookResult.cc
  48. 22 0
      ess/src/model/CreateScalingConfigurationResult.cc
  49. 22 0
      ess/src/model/CreateScalingGroupResult.cc
  50. 0 60
      ess/src/model/CreateScalingRuleResult.cc
  51. 0 108
      ess/src/model/DescribeAccountAttributesResult.cc
  52. 2 0
      ess/src/model/DescribeAlarmsRequest.cc
  53. 0 71
      ess/src/model/DescribeAlertConfigRequest.cc
  54. 0 65
      ess/src/model/DescribeAlertConfigResult.cc
  55. 0 115
      ess/src/model/DescribeCapacityHistoryRequest.cc
  56. 0 86
      ess/src/model/DescribeCapacityHistoryResult.cc
  57. 106 0
      ess/src/model/DescribeLifecycleActionsRequest.cc
  58. 87 0
      ess/src/model/DescribeLifecycleActionsResult.cc
  59. 19 0
      ess/src/model/DescribeLifecycleHooksRequest.cc
  60. 4 0
      ess/src/model/DescribeScalingGroupsRequest.cc
  61. 2 0
      ess/src/model/DescribeScalingInstancesRequest.cc
  62. 4 0
      ess/src/model/DescribeScalingRulesRequest.cc
  63. 11 0
      ess/src/model/DescribeScheduledTasksRequest.cc
  64. 11 0
      ess/src/model/DescribeScheduledTasksResult.cc
  65. 11 0
      ess/src/model/DetachDBInstancesResult.cc
  66. 11 0
      ess/src/model/DetachInstancesResult.cc
  67. 11 0
      ess/src/model/DetachLoadBalancersResult.cc
  68. 26 15
      ess/src/model/DetachVServerGroupsResult.cc
  69. 26 15
      ess/src/model/EnterStandbyResult.cc
  70. 11 0
      ess/src/model/ExitStandbyResult.cc
  71. 0 104
      ess/src/model/ModifyAlarmResult.cc
  72. 0 44
      ess/src/model/ModifyAlertConfigResult.cc
  73. 99 0
      ess/src/model/ModifyLifecycleHookRequest.cc
  74. 22 0
      ess/src/model/ModifyScalingConfigurationResult.cc
  75. 22 0
      ess/src/model/ModifyScalingGroupResult.cc
  76. 33 22
      ess/src/model/ModifyScalingRuleResult.cc
  77. 33 22
      ess/src/model/SetInstancesProtectionRequest.cc
  78. 11 0
      ess/src/model/VerifyAuthenticationRequest.cc
  79. 0 0
      ess/src/model/VerifyAuthenticationResult.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-10-26 Version: patch
+- Update ScalingConfig parameters.
+
 2020-10-23 Version: patch
 - Change Configuration.
 

+ 4 - 16
ess/CMakeLists.txt

@@ -61,14 +61,10 @@ set(ess_public_header_model
 	include/alibabacloud/ess/model/DeleteScalingRuleResult.h
 	include/alibabacloud/ess/model/DeleteScheduledTaskRequest.h
 	include/alibabacloud/ess/model/DeleteScheduledTaskResult.h
-	include/alibabacloud/ess/model/DescribeAccountAttributesRequest.h
-	include/alibabacloud/ess/model/DescribeAccountAttributesResult.h
 	include/alibabacloud/ess/model/DescribeAlarmsRequest.h
 	include/alibabacloud/ess/model/DescribeAlarmsResult.h
-	include/alibabacloud/ess/model/DescribeAlertConfigRequest.h
-	include/alibabacloud/ess/model/DescribeAlertConfigResult.h
-	include/alibabacloud/ess/model/DescribeCapacityHistoryRequest.h
-	include/alibabacloud/ess/model/DescribeCapacityHistoryResult.h
+	include/alibabacloud/ess/model/DescribeLifecycleActionsRequest.h
+	include/alibabacloud/ess/model/DescribeLifecycleActionsResult.h
 	include/alibabacloud/ess/model/DescribeLifecycleHooksRequest.h
 	include/alibabacloud/ess/model/DescribeLifecycleHooksResult.h
 	include/alibabacloud/ess/model/DescribeLimitationRequest.h
@@ -123,8 +119,6 @@ set(ess_public_header_model
 	include/alibabacloud/ess/model/ListTagValuesResult.h
 	include/alibabacloud/ess/model/ModifyAlarmRequest.h
 	include/alibabacloud/ess/model/ModifyAlarmResult.h
-	include/alibabacloud/ess/model/ModifyAlertConfigRequest.h
-	include/alibabacloud/ess/model/ModifyAlertConfigResult.h
 	include/alibabacloud/ess/model/ModifyLifecycleHookRequest.h
 	include/alibabacloud/ess/model/ModifyLifecycleHookResult.h
 	include/alibabacloud/ess/model/ModifyNotificationConfigurationRequest.h
@@ -204,14 +198,10 @@ set(ess_src
 	src/model/DeleteScalingRuleResult.cc
 	src/model/DeleteScheduledTaskRequest.cc
 	src/model/DeleteScheduledTaskResult.cc
-	src/model/DescribeAccountAttributesRequest.cc
-	src/model/DescribeAccountAttributesResult.cc
 	src/model/DescribeAlarmsRequest.cc
 	src/model/DescribeAlarmsResult.cc
-	src/model/DescribeAlertConfigRequest.cc
-	src/model/DescribeAlertConfigResult.cc
-	src/model/DescribeCapacityHistoryRequest.cc
-	src/model/DescribeCapacityHistoryResult.cc
+	src/model/DescribeLifecycleActionsRequest.cc
+	src/model/DescribeLifecycleActionsResult.cc
 	src/model/DescribeLifecycleHooksRequest.cc
 	src/model/DescribeLifecycleHooksResult.cc
 	src/model/DescribeLimitationRequest.cc
@@ -266,8 +256,6 @@ set(ess_src
 	src/model/ListTagValuesResult.cc
 	src/model/ModifyAlarmRequest.cc
 	src/model/ModifyAlarmResult.cc
-	src/model/ModifyAlertConfigRequest.cc
-	src/model/ModifyAlertConfigResult.cc
 	src/model/ModifyLifecycleHookRequest.cc
 	src/model/ModifyLifecycleHookResult.cc
 	src/model/ModifyNotificationConfigurationRequest.cc

+ 8 - 32
ess/include/alibabacloud/ess/EssClient.h

@@ -62,14 +62,10 @@
 #include "model/DeleteScalingRuleResult.h"
 #include "model/DeleteScheduledTaskRequest.h"
 #include "model/DeleteScheduledTaskResult.h"
-#include "model/DescribeAccountAttributesRequest.h"
-#include "model/DescribeAccountAttributesResult.h"
 #include "model/DescribeAlarmsRequest.h"
 #include "model/DescribeAlarmsResult.h"
-#include "model/DescribeAlertConfigRequest.h"
-#include "model/DescribeAlertConfigResult.h"
-#include "model/DescribeCapacityHistoryRequest.h"
-#include "model/DescribeCapacityHistoryResult.h"
+#include "model/DescribeLifecycleActionsRequest.h"
+#include "model/DescribeLifecycleActionsResult.h"
 #include "model/DescribeLifecycleHooksRequest.h"
 #include "model/DescribeLifecycleHooksResult.h"
 #include "model/DescribeLimitationRequest.h"
@@ -124,8 +120,6 @@
 #include "model/ListTagValuesResult.h"
 #include "model/ModifyAlarmRequest.h"
 #include "model/ModifyAlarmResult.h"
-#include "model/ModifyAlertConfigRequest.h"
-#include "model/ModifyAlertConfigResult.h"
 #include "model/ModifyLifecycleHookRequest.h"
 #include "model/ModifyLifecycleHookResult.h"
 #include "model/ModifyNotificationConfigurationRequest.h"
@@ -231,18 +225,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DeleteScheduledTaskResult> DeleteScheduledTaskOutcome;
 			typedef std::future<DeleteScheduledTaskOutcome> DeleteScheduledTaskOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::DeleteScheduledTaskRequest&, const DeleteScheduledTaskOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteScheduledTaskAsyncHandler;
-			typedef Outcome<Error, Model::DescribeAccountAttributesResult> DescribeAccountAttributesOutcome;
-			typedef std::future<DescribeAccountAttributesOutcome> DescribeAccountAttributesOutcomeCallable;
-			typedef std::function<void(const EssClient*, const Model::DescribeAccountAttributesRequest&, const DescribeAccountAttributesOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAccountAttributesAsyncHandler;
 			typedef Outcome<Error, Model::DescribeAlarmsResult> DescribeAlarmsOutcome;
 			typedef std::future<DescribeAlarmsOutcome> DescribeAlarmsOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::DescribeAlarmsRequest&, const DescribeAlarmsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAlarmsAsyncHandler;
-			typedef Outcome<Error, Model::DescribeAlertConfigResult> DescribeAlertConfigOutcome;
-			typedef std::future<DescribeAlertConfigOutcome> DescribeAlertConfigOutcomeCallable;
-			typedef std::function<void(const EssClient*, const Model::DescribeAlertConfigRequest&, const DescribeAlertConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeAlertConfigAsyncHandler;
-			typedef Outcome<Error, Model::DescribeCapacityHistoryResult> DescribeCapacityHistoryOutcome;
-			typedef std::future<DescribeCapacityHistoryOutcome> DescribeCapacityHistoryOutcomeCallable;
-			typedef std::function<void(const EssClient*, const Model::DescribeCapacityHistoryRequest&, const DescribeCapacityHistoryOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeCapacityHistoryAsyncHandler;
+			typedef Outcome<Error, Model::DescribeLifecycleActionsResult> DescribeLifecycleActionsOutcome;
+			typedef std::future<DescribeLifecycleActionsOutcome> DescribeLifecycleActionsOutcomeCallable;
+			typedef std::function<void(const EssClient*, const Model::DescribeLifecycleActionsRequest&, const DescribeLifecycleActionsOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeLifecycleActionsAsyncHandler;
 			typedef Outcome<Error, Model::DescribeLifecycleHooksResult> DescribeLifecycleHooksOutcome;
 			typedef std::future<DescribeLifecycleHooksOutcome> DescribeLifecycleHooksOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::DescribeLifecycleHooksRequest&, const DescribeLifecycleHooksOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeLifecycleHooksAsyncHandler;
@@ -324,9 +312,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyAlarmResult> ModifyAlarmOutcome;
 			typedef std::future<ModifyAlarmOutcome> ModifyAlarmOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::ModifyAlarmRequest&, const ModifyAlarmOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAlarmAsyncHandler;
-			typedef Outcome<Error, Model::ModifyAlertConfigResult> ModifyAlertConfigOutcome;
-			typedef std::future<ModifyAlertConfigOutcome> ModifyAlertConfigOutcomeCallable;
-			typedef std::function<void(const EssClient*, const Model::ModifyAlertConfigRequest&, const ModifyAlertConfigOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAlertConfigAsyncHandler;
 			typedef Outcome<Error, Model::ModifyLifecycleHookResult> ModifyLifecycleHookOutcome;
 			typedef std::future<ModifyLifecycleHookOutcome> ModifyLifecycleHookOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::ModifyLifecycleHookRequest&, const ModifyLifecycleHookOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyLifecycleHookAsyncHandler;
@@ -446,18 +431,12 @@ namespace AlibabaCloud
 			DeleteScheduledTaskOutcome deleteScheduledTask(const Model::DeleteScheduledTaskRequest &request)const;
 			void deleteScheduledTaskAsync(const Model::DeleteScheduledTaskRequest& request, const DeleteScheduledTaskAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteScheduledTaskOutcomeCallable deleteScheduledTaskCallable(const Model::DeleteScheduledTaskRequest& request) const;
-			DescribeAccountAttributesOutcome describeAccountAttributes(const Model::DescribeAccountAttributesRequest &request)const;
-			void describeAccountAttributesAsync(const Model::DescribeAccountAttributesRequest& request, const DescribeAccountAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeAccountAttributesOutcomeCallable describeAccountAttributesCallable(const Model::DescribeAccountAttributesRequest& request) const;
 			DescribeAlarmsOutcome describeAlarms(const Model::DescribeAlarmsRequest &request)const;
 			void describeAlarmsAsync(const Model::DescribeAlarmsRequest& request, const DescribeAlarmsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeAlarmsOutcomeCallable describeAlarmsCallable(const Model::DescribeAlarmsRequest& request) const;
-			DescribeAlertConfigOutcome describeAlertConfig(const Model::DescribeAlertConfigRequest &request)const;
-			void describeAlertConfigAsync(const Model::DescribeAlertConfigRequest& request, const DescribeAlertConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeAlertConfigOutcomeCallable describeAlertConfigCallable(const Model::DescribeAlertConfigRequest& request) const;
-			DescribeCapacityHistoryOutcome describeCapacityHistory(const Model::DescribeCapacityHistoryRequest &request)const;
-			void describeCapacityHistoryAsync(const Model::DescribeCapacityHistoryRequest& request, const DescribeCapacityHistoryAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			DescribeCapacityHistoryOutcomeCallable describeCapacityHistoryCallable(const Model::DescribeCapacityHistoryRequest& request) const;
+			DescribeLifecycleActionsOutcome describeLifecycleActions(const Model::DescribeLifecycleActionsRequest &request)const;
+			void describeLifecycleActionsAsync(const Model::DescribeLifecycleActionsRequest& request, const DescribeLifecycleActionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeLifecycleActionsOutcomeCallable describeLifecycleActionsCallable(const Model::DescribeLifecycleActionsRequest& request) const;
 			DescribeLifecycleHooksOutcome describeLifecycleHooks(const Model::DescribeLifecycleHooksRequest &request)const;
 			void describeLifecycleHooksAsync(const Model::DescribeLifecycleHooksRequest& request, const DescribeLifecycleHooksAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeLifecycleHooksOutcomeCallable describeLifecycleHooksCallable(const Model::DescribeLifecycleHooksRequest& request) const;
@@ -539,9 +518,6 @@ namespace AlibabaCloud
 			ModifyAlarmOutcome modifyAlarm(const Model::ModifyAlarmRequest &request)const;
 			void modifyAlarmAsync(const Model::ModifyAlarmRequest& request, const ModifyAlarmAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyAlarmOutcomeCallable modifyAlarmCallable(const Model::ModifyAlarmRequest& request) const;
-			ModifyAlertConfigOutcome modifyAlertConfig(const Model::ModifyAlertConfigRequest &request)const;
-			void modifyAlertConfigAsync(const Model::ModifyAlertConfigRequest& request, const ModifyAlertConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
-			ModifyAlertConfigOutcomeCallable modifyAlertConfigCallable(const Model::ModifyAlertConfigRequest& request) const;
 			ModifyLifecycleHookOutcome modifyLifecycleHook(const Model::ModifyLifecycleHookRequest &request)const;
 			void modifyLifecycleHookAsync(const Model::ModifyLifecycleHookRequest& request, const ModifyLifecycleHookAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ModifyLifecycleHookOutcomeCallable modifyLifecycleHookCallable(const Model::ModifyLifecycleHookRequest& request) const;

+ 3 - 0
ess/include/alibabacloud/ess/model/AttachDBInstancesRequest.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				AttachDBInstancesRequest();
 				~AttachDBInstancesRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				bool getForceAttach()const;
@@ -49,6 +51,7 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 
             private:
+				std::string clientToken_;
 				std::string scalingGroupId_;
 				bool forceAttach_;
 				std::string accessKeyId_;

+ 3 - 0
ess/include/alibabacloud/ess/model/AttachDBInstancesResult.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				AttachLoadBalancersRequest();
 				~AttachLoadBalancersRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				bool getForceAttach()const;
@@ -49,6 +51,7 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 
             private:
+				std::string clientToken_;
 				std::string scalingGroupId_;
 				bool forceAttach_;
 				std::string accessKeyId_;

+ 3 - 0
ess/include/alibabacloud/ess/model/AttachLoadBalancersResult.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				AttachVServerGroupsRequest();
 				~AttachVServerGroupsRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				bool getForceAttach()const;
@@ -63,6 +65,7 @@ namespace AlibabaCloud
 				void setVServerGroup(const std::vector<VServerGroup>& vServerGroup);
 
             private:
+				std::string clientToken_;
 				std::string scalingGroupId_;
 				bool forceAttach_;
 				std::string accessKeyId_;

+ 3 - 0
ess/include/alibabacloud/ess/model/AttachVServerGroupsResult.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				std::string getLifecycleActionToken()const;
 				void setLifecycleActionToken(const std::string& lifecycleActionToken);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getResourceOwnerAccount()const;
@@ -52,6 +54,7 @@ namespace AlibabaCloud
 
             private:
 				std::string lifecycleActionToken_;
+				std::string clientToken_;
 				std::string accessKeyId_;
 				std::string resourceOwnerAccount_;
 				std::string lifecycleHookId_;

+ 3 - 0
ess/include/alibabacloud/ess/model/CompleteLifecycleActionResult.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setThreshold(float threshold);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getEffective()const;
+				void setEffective(const std::string& effective);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				int getEvaluationCount()const;
@@ -83,6 +85,7 @@ namespace AlibabaCloud
 				std::vector<std::string> alarmAction_;
 				float threshold_;
 				std::string accessKeyId_;
+				std::string effective_;
 				std::string regionId_;
 				int evaluationCount_;
 				std::string metricName_;

+ 0 - 13
ess/include/alibabacloud/ess/model/CreateAlarmResult.h

@@ -30,16 +30,6 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_ESS_EXPORT CreateLifecycleHookRequest : public RpcServiceRequest
 			{
-			public:
-				struct LifecycleHook
-				{
-					std::string defaultResult;
-					std::string lifecycleHookName;
-					int heartbeatTimeout;
-					std::string notificationArn;
-					std::string notificationMetadata;
-					std::string lifecycleTransition;
-				};
 
 			public:
 				CreateLifecycleHookRequest();
@@ -67,8 +57,6 @@ namespace AlibabaCloud
 				void setNotificationMetadata(const std::string& notificationMetadata);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::vector<LifecycleHook> getLifecycleHook()const;
-				void setLifecycleHook(const std::vector<LifecycleHook>& lifecycleHook);
 
             private:
 				std::string defaultResult_;
@@ -82,7 +70,6 @@ namespace AlibabaCloud
 				std::string ownerAccount_;
 				std::string notificationMetadata_;
 				long ownerId_;
-				std::vector<LifecycleHook> lifecycleHook_;
 
 			};
 		}

+ 27 - 0
ess/include/alibabacloud/ess/model/CreateLifecycleHookResult.h

@@ -64,6 +64,8 @@ namespace AlibabaCloud
 				void setSpotPriceLimit(const std::vector<SpotPriceLimit>& spotPriceLimit);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getPrivatePoolOptionsMatchCriteria()const;
+				void setPrivatePoolOptionsMatchCriteria(const std::string& privatePoolOptionsMatchCriteria);
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				std::string getPassword()const;
@@ -72,6 +74,8 @@ namespace AlibabaCloud
 				void setInstanceDescription(const std::string& instanceDescription);
 				std::string getSystemDiskAutoSnapshotPolicyId()const;
 				void setSystemDiskAutoSnapshotPolicyId(const std::string& systemDiskAutoSnapshotPolicyId);
+				std::string getPrivatePoolOptionsId()const;
+				void setPrivatePoolOptionsId(const std::string& privatePoolOptionsId);
 				int getIpv6AddressCount()const;
 				void setIpv6AddressCount(int ipv6AddressCount);
 				int getCpu()const;
@@ -88,8 +92,12 @@ namespace AlibabaCloud
 				void setInstanceName(const std::string& instanceName);
 				std::string getInternetChargeType()const;
 				void setInternetChargeType(const std::string& internetChargeType);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
 				int getInternetMaxBandwidthIn()const;
 				void setInternetMaxBandwidthIn(int internetMaxBandwidthIn);
+				std::string getAffinity()const;
+				void setAffinity(const std::string& affinity);
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
 				int getMemory()const;
@@ -118,16 +126,24 @@ namespace AlibabaCloud
 				void setImageName(const std::string& imageName);
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
+				std::map<std::string, std::string> getSchedulerOptions()const;
+				void setSchedulerOptions(const std::map<std::string, std::string>& schedulerOptions);
 				std::string getDeploymentSetId()const;
 				void setDeploymentSetId(const std::string& deploymentSetId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getTenancy()const;
+				void setTenancy(const std::string& tenancy);
 				std::string getSystemDiskDiskName()const;
 				void setSystemDiskDiskName(const std::string& systemDiskDiskName);
 				std::string getRamRoleName()const;
 				void setRamRoleName(const std::string& ramRoleName);
+				std::string getDedicatedHostId()const;
+				void setDedicatedHostId(const std::string& dedicatedHostId);
+				std::string getCreditSpecification()const;
+				void setCreditSpecification(const std::string& creditSpecification);
 				std::vector<std::string> getSecurityGroupIds()const;
 				void setSecurityGroupIds(const std::vector<std::string>& securityGroupIds);
 				std::vector<DataDisk> getDataDisk()const;
@@ -136,6 +152,8 @@ namespace AlibabaCloud
 				void setLoadBalancerWeight(int loadBalancerWeight);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
+				std::string getImageFamily()const;
+				void setImageFamily(const std::string& imageFamily);
 				std::string getSystemDiskDescription()const;
 				void setSystemDiskDescription(const std::string& systemDiskDescription);
 
@@ -145,10 +163,12 @@ namespace AlibabaCloud
 				std::string keyPairName_;
 				std::vector<SpotPriceLimit> spotPriceLimit_;
 				std::string resourceGroupId_;
+				std::string privatePoolOptionsMatchCriteria_;
 				std::string hostName_;
 				std::string password_;
 				std::string instanceDescription_;
 				std::string systemDiskAutoSnapshotPolicyId_;
+				std::string privatePoolOptionsId_;
 				int ipv6AddressCount_;
 				int cpu_;
 				long ownerId_;
@@ -157,7 +177,9 @@ namespace AlibabaCloud
 				std::string spotStrategy_;
 				std::string instanceName_;
 				std::string internetChargeType_;
+				std::string zoneId_;
 				int internetMaxBandwidthIn_;
+				std::string affinity_;
 				std::string imageId_;
 				int memory_;
 				std::string clientToken_;
@@ -172,15 +194,20 @@ namespace AlibabaCloud
 				bool passwordInherit_;
 				std::string imageName_;
 				std::string instanceType_;
+				std::map<std::string, std::string> schedulerOptions_;
 				std::string deploymentSetId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string tenancy_;
 				std::string systemDiskDiskName_;
 				std::string ramRoleName_;
+				std::string dedicatedHostId_;
+				std::string creditSpecification_;
 				std::vector<std::string> securityGroupIds_;
 				std::vector<DataDisk> dataDisk_;
 				int loadBalancerWeight_;
 				int systemDiskSize_;
+				std::string imageFamily_;
 				std::string systemDiskDescription_;
 
 			};

+ 6 - 0
ess/include/alibabacloud/ess/model/CreateScalingConfigurationResult.h

@@ -65,6 +65,8 @@ namespace AlibabaCloud
 				void setVSwitchIds(const std::vector<std::string>& vSwitchIds);
 				bool getSpotInstanceRemedy()const;
 				void setSpotInstanceRemedy(bool spotInstanceRemedy);
+				bool getScaleOutAmountCheck()const;
+				void setScaleOutAmountCheck(bool scaleOutAmountCheck);
 				std::vector<Tag> getTag()const;
 				void setTag(const std::vector<Tag>& tag);
 				int getDefaultCooldown()const;
@@ -77,6 +79,8 @@ namespace AlibabaCloud
 				void setLaunchTemplateId(const std::string& launchTemplateId);
 				int getDesiredCapacity()const;
 				void setDesiredCapacity(int desiredCapacity);
+				bool getCompensateWithOnDemand()const;
+				void setCompensateWithOnDemand(bool compensateWithOnDemand);
 				int getMinSize()const;
 				void setMinSize(int minSize);
 				long getOwnerId()const;
@@ -127,12 +131,14 @@ namespace AlibabaCloud
             private:
 				std::vector<std::string> vSwitchIds_;
 				bool spotInstanceRemedy_;
+				bool scaleOutAmountCheck_;
 				std::vector<Tag> tag_;
 				int defaultCooldown_;
 				std::string multiAZPolicy_;
 				std::string dBInstanceIds_;
 				std::string launchTemplateId_;
 				int desiredCapacity_;
+				bool compensateWithOnDemand_;
 				int minSize_;
 				long ownerId_;
 				std::string vSwitchId_;

+ 6 - 0
ess/include/alibabacloud/ess/model/CreateScalingGroupResult.h

@@ -58,6 +58,8 @@ namespace AlibabaCloud
 				void setCooldown(int cooldown);
 				std::string getPredictiveValueBehavior()const;
 				void setPredictiveValueBehavior(const std::string& predictiveValueBehavior);
+				int getScaleInEvaluationCount()const;
+				void setScaleInEvaluationCount(int scaleInEvaluationCount);
 				std::string getScalingRuleType()const;
 				void setScalingRuleType(const std::string& scalingRuleType);
 				std::string getMetricName()const;
@@ -80,6 +82,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				int getPredictiveValueBuffer()const;
 				void setPredictiveValueBuffer(int predictiveValueBuffer);
+				int getScaleOutEvaluationCount()const;
+				void setScaleOutEvaluationCount(int scaleOutEvaluationCount);
 				int getMinAdjustmentMagnitude()const;
 				void setMinAdjustmentMagnitude(int minAdjustmentMagnitude);
 				float getTargetValue()const;
@@ -94,6 +98,7 @@ namespace AlibabaCloud
 				std::string scalingRuleName_;
 				int cooldown_;
 				std::string predictiveValueBehavior_;
+				int scaleInEvaluationCount_;
 				std::string scalingRuleType_;
 				std::string metricName_;
 				std::string predictiveScalingMode_;
@@ -105,6 +110,7 @@ namespace AlibabaCloud
 				std::string adjustmentType_;
 				long ownerId_;
 				int predictiveValueBuffer_;
+				int scaleOutEvaluationCount_;
 				int minAdjustmentMagnitude_;
 				float targetValue_;
 

+ 0 - 67
ess/include/alibabacloud/ess/model/CreateScalingRuleResult.h

@@ -1,67 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ess/EssExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ess
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ESS_EXPORT DescribeAccountAttributesResult : public ServiceResult
-			{
-			public:
-
-
-				DescribeAccountAttributesResult();
-				explicit DescribeAccountAttributesResult(const std::string &payload);
-				~DescribeAccountAttributesResult();
-				int getMaxNumberOfScalingRules()const;
-				int getMaxNumberOfScalingInstances()const;
-				int getMaxNumberOfScheduledTasks()const;
-				int getMaxNumberOfLoadBalancers()const;
-				int getMaxNumberOfMinSize()const;
-				int getMaxNumberOfScalingGroups()const;
-				int getMaxNumberOfScalingConfigurations()const;
-				int getMaxNumberOfDBInstances()const;
-				int getMaxNumberOfMaxSize()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int maxNumberOfScalingRules_;
-				int maxNumberOfScalingInstances_;
-				int maxNumberOfScheduledTasks_;
-				int maxNumberOfLoadBalancers_;
-				int maxNumberOfMinSize_;
-				int maxNumberOfScalingGroups_;
-				int maxNumberOfScalingConfigurations_;
-				int maxNumberOfDBInstances_;
-				int maxNumberOfMaxSize_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESRESULT_H_

+ 1 - 0
ess/include/alibabacloud/ess/model/DescribeAlarmsRequest.h

@@ -48,6 +48,7 @@ namespace AlibabaCloud
 					int evaluationCount;
 					std::string statistics;
 					std::string name;
+					std::string effective;
 					std::vector<std::string> alarmActions;
 					std::string metricName;
 					std::string state;

+ 0 - 57
ess/include/alibabacloud/ess/model/DescribeAlertConfigRequest.h

@@ -1,57 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBEALERTCONFIGREQUEST_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBEALERTCONFIGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ess/EssExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ess
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ESS_EXPORT DescribeAlertConfigRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAlertConfigRequest();
-				~DescribeAlertConfigRequest();
-
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getScalingGroupId()const;
-				void setScalingGroupId(const std::string& scalingGroupId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string resourceOwnerAccount_;
-				std::string scalingGroupId_;
-				long ownerId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBEALERTCONFIGREQUEST_H_

+ 0 - 55
ess/include/alibabacloud/ess/model/DescribeAlertConfigResult.h

@@ -1,55 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBEALERTCONFIGRESULT_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBEALERTCONFIGRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ess/EssExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ess
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ESS_EXPORT DescribeAlertConfigResult : public ServiceResult
-			{
-			public:
-
-
-				DescribeAlertConfigResult();
-				explicit DescribeAlertConfigResult(const std::string &payload);
-				~DescribeAlertConfigResult();
-				int getFailConfig()const;
-				int getRejectConfig()const;
-				int getSuccessConfig()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				int failConfig_;
-				int rejectConfig_;
-				int successConfig_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBEALERTCONFIGRESULT_H_

+ 0 - 69
ess/include/alibabacloud/ess/model/DescribeCapacityHistoryRequest.h

@@ -1,69 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBECAPACITYHISTORYREQUEST_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBECAPACITYHISTORYREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ess/EssExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ess
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ESS_EXPORT DescribeCapacityHistoryRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeCapacityHistoryRequest();
-				~DescribeCapacityHistoryRequest();
-
-				std::string getScalingGroupId()const;
-				void setScalingGroupId(const std::string& scalingGroupId);
-				std::string getStartTime()const;
-				void setStartTime(const std::string& startTime);
-				int getPageNumber()const;
-				void setPageNumber(int pageNumber);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				int getPageSize()const;
-				void setPageSize(int pageSize);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getEndTime()const;
-				void setEndTime(const std::string& endTime);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-
-            private:
-				std::string scalingGroupId_;
-				std::string startTime_;
-				int pageNumber_;
-				std::string accessKeyId_;
-				int pageSize_;
-				std::string resourceOwnerAccount_;
-				std::string endTime_;
-				long ownerId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBECAPACITYHISTORYREQUEST_H_

+ 21 - 9
ess/include/alibabacloud/ess/model/DescribeAccountAttributesRequest.h → ess/include/alibabacloud/ess/model/DescribeLifecycleActionsRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
+#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBELIFECYCLEACTIONSREQUEST_H_
+#define ALIBABACLOUD_ESS_MODEL_DESCRIBELIFECYCLEACTIONSREQUEST_H_
 
 #include <string>
 #include <vector>
@@ -28,27 +28,39 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ESS_EXPORT DescribeAccountAttributesRequest : public RpcServiceRequest
+			class ALIBABACLOUD_ESS_EXPORT DescribeLifecycleActionsRequest : public RpcServiceRequest
 			{
 
 			public:
-				DescribeAccountAttributesRequest();
-				~DescribeAccountAttributesRequest();
+				DescribeLifecycleActionsRequest();
+				~DescribeLifecycleActionsRequest();
 
+				std::string getLifecycleActionStatus()const;
+				void setLifecycleActionStatus(const std::string& lifecycleActionStatus);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getNextToken()const;
+				void setNextToken(const std::string& nextToken);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getScalingActivityId()const;
+				void setScalingActivityId(const std::string& scalingActivityId);
+				int getMaxResults()const;
+				void setMaxResults(int maxResults);
 
             private:
+				std::string lifecycleActionStatus_;
+				std::string accessKeyId_;
+				std::string nextToken_;
 				std::string resourceOwnerAccount_;
 				long ownerId_;
-				std::string accessKeyId_;
+				std::string scalingActivityId_;
+				int maxResults_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
+#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBELIFECYCLEACTIONSREQUEST_H_

+ 19 - 19
ess/include/alibabacloud/ess/model/DescribeCapacityHistoryResult.h → ess/include/alibabacloud/ess/model/DescribeLifecycleActionsResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBECAPACITYHISTORYRESULT_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBECAPACITYHISTORYRESULT_H_
+#ifndef ALIBABACLOUD_ESS_MODEL_DESCRIBELIFECYCLEACTIONSRESULT_H_
+#define ALIBABACLOUD_ESS_MODEL_DESCRIBELIFECYCLEACTIONSRESULT_H_
 
 #include <string>
 #include <vector>
@@ -29,37 +29,37 @@ namespace AlibabaCloud
 	{
 		namespace Model
 		{
-			class ALIBABACLOUD_ESS_EXPORT DescribeCapacityHistoryResult : public ServiceResult
+			class ALIBABACLOUD_ESS_EXPORT DescribeLifecycleActionsResult : public ServiceResult
 			{
 			public:
-				struct CapacityHistoryModel
+				struct LifecycleAction
 				{
-					int attachedCapacity;
-					std::string scalingGroupId;
-					int totalCapacity;
-					int autoCreatedCapacity;
-					std::string timestamp;
+					std::string lifecycleActionStatus;
+					std::string lifecycleActionResult;
+					std::vector<std::string> instanceIds;
+					std::string lifecycleActionToken;
+					std::string lifecycleHookId;
 				};
 
 
-				DescribeCapacityHistoryResult();
-				explicit DescribeCapacityHistoryResult(const std::string &payload);
-				~DescribeCapacityHistoryResult();
+				DescribeLifecycleActionsResult();
+				explicit DescribeLifecycleActionsResult(const std::string &payload);
+				~DescribeLifecycleActionsResult();
 				int getTotalCount()const;
-				int getPageSize()const;
-				int getPageNumber()const;
-				std::vector<CapacityHistoryModel> getCapacityHistoryItems()const;
+				std::string getNextToken()const;
+				int getMaxResults()const;
+				std::vector<LifecycleAction> getLifecycleActions()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
 				int totalCount_;
-				int pageSize_;
-				int pageNumber_;
-				std::vector<CapacityHistoryModel> capacityHistoryItems_;
+				std::string nextToken_;
+				int maxResults_;
+				std::vector<LifecycleAction> lifecycleActions_;
 
 			};
 		}
 	}
 }
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBECAPACITYHISTORYRESULT_H_
+#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBELIFECYCLEACTIONSRESULT_H_

+ 29 - 16
ess/include/alibabacloud/ess/model/DescribeLifecycleHooksRequest.h

@@ -34,6 +34,10 @@ namespace AlibabaCloud
 			public:
 				struct ScalingConfiguration
 				{
+					struct SchedulerOptions
+					{
+						std::string managedPrivateSpaceId;
+					};
 					struct DataDisk
 					{
 						std::string snapshotId;
@@ -58,45 +62,54 @@ namespace AlibabaCloud
 						std::string instanceType;
 					};
 					std::string scalingConfigurationName;
+					std::string dedicatedHostId;
 					std::vector<ScalingConfiguration::DataDisk> dataDisks;
 					std::string resourceGroupId;
-					int systemDiskSize;
 					std::string systemDiskDescription;
-					std::string userData;
 					int memory;
 					int cpu;
+					std::string ramRoleName;
+					std::string imageId;
+					std::vector<ScalingConfiguration::Tag> tags;
+					std::string hostName;
+					int loadBalancerWeight;
+					std::string scalingGroupId;
+					std::string imageFamily;
+					std::string privatePoolOptionsMatchCriteria;
+					std::vector<std::string> securityGroupIds;
+					std::string internetChargeType;
+					std::string privatePoolOptionsId;
+					std::string instanceName;
+					std::string deploymentSetId;
+					int internetMaxBandwidthOut;
+					std::string creationTime;
+					std::string affinity;
+					std::string scalingConfigurationId;
+					std::string securityEnhancementStrategy;
+					std::string tenancy;
+					int systemDiskSize;
+					std::string userData;
 					std::string lifecycleState;
 					std::string systemDiskAutoSnapshotPolicyId;
 					std::string systemDiskName;
-					std::string ramRoleName;
 					int ipv6AddressCount;
-					std::string imageId;
+					SchedulerOptions schedulerOptions;
 					std::vector<ScalingConfiguration::SpotPriceModel> spotPriceLimit;
 					std::vector<std::string> instanceTypes;
 					std::string instanceType;
-					std::vector<ScalingConfiguration::Tag> tags;
-					std::string hostName;
 					std::string spotStrategy;
 					bool passwordInherit;
 					std::string keyPairName;
-					int loadBalancerWeight;
 					std::string ioOptimized;
-					std::string scalingGroupId;
+					std::string zoneId;
 					std::string hpcClusterId;
 					std::string securityGroupId;
-					std::vector<std::string> securityGroupIds;
-					std::string internetChargeType;
 					std::string systemDiskCategory;
-					std::string instanceName;
-					std::string deploymentSetId;
 					std::string imageName;
-					int internetMaxBandwidthOut;
 					int internetMaxBandwidthIn;
-					std::string creationTime;
 					std::string instanceGeneration;
 					std::string instanceDescription;
-					std::string scalingConfigurationId;
-					std::string securityEnhancementStrategy;
+					std::string creditSpecification;
 				};
 
 

+ 2 - 0
ess/include/alibabacloud/ess/model/DescribeScalingGroupsRequest.h

@@ -47,6 +47,7 @@ namespace AlibabaCloud
 					};
 					bool spotInstanceRemedy;
 					std::string activeScalingConfigurationId;
+					bool compensateWithOnDemand;
 					int onDemandPercentageAboveBaseCapacity;
 					int desiredCapacity;
 					std::string lifecycleState;
@@ -74,6 +75,7 @@ namespace AlibabaCloud
 					int activeCapacity;
 					int minSize;
 					int defaultCooldown;
+					bool scaleOutAmountCheck;
 					std::string vpcId;
 					std::string launchTemplateVersion;
 					std::string creationTime;

+ 5 - 4
ess/include/alibabacloud/ess/model/DescribeScalingInstancesRequest.h

@@ -35,17 +35,18 @@ namespace AlibabaCloud
 				struct ScalingInstance
 				{
 					int loadBalancerWeight;
-					std::string warmupState;
+					std::string createdTime;
 					std::string instanceId;
 					std::string scalingGroupId;
 					std::string healthStatus;
-					std::string creationTime;
-					std::string launchTemplateVersion;
 					std::string lifecycleState;
 					std::string launchTemplateId;
+					std::string creationType;
+					std::string warmupState;
+					std::string creationTime;
+					std::string launchTemplateVersion;
 					bool entrusted;
 					std::string scalingConfigurationId;
-					std::string creationType;
 				};
 
 

+ 2 - 0
ess/include/alibabacloud/ess/model/DescribeScalingRulesRequest.h

@@ -72,9 +72,11 @@ namespace AlibabaCloud
 					std::string metricName;
 					std::string scalingRuleName;
 					int adjustmentValue;
+					int scaleOutEvaluationCount;
 					int initialMaxSize;
 					std::string scalingRuleType;
 					int estimatedInstanceWarmup;
+					int scaleInEvaluationCount;
 					std::string predictiveScalingMode;
 					int predictiveValueBuffer;
 					int predictiveTaskBufferTime;

+ 3 - 0
ess/include/alibabacloud/ess/model/DescribeScheduledTasksRequest.h

@@ -65,6 +65,8 @@ namespace AlibabaCloud
 				void setScheduledTaskName18(const std::string& scheduledTaskName18);
 				std::string getScheduledTaskId20()const;
 				void setScheduledTaskId20(const std::string& scheduledTaskId20);
+				std::string getScalingGroupId()const;
+				void setScalingGroupId(const std::string& scalingGroupId);
 				std::string getScheduledTaskName13()const;
 				void setScheduledTaskName13(const std::string& scheduledTaskName13);
 				std::string getScheduledTaskName12()const;
@@ -188,6 +190,7 @@ namespace AlibabaCloud
 				std::string scheduledTaskName19_;
 				std::string scheduledTaskName18_;
 				std::string scheduledTaskId20_;
+				std::string scalingGroupId_;
 				std::string scheduledTaskName13_;
 				std::string scheduledTaskName12_;
 				std::string scheduledTaskName11_;

+ 3 - 0
ess/include/alibabacloud/ess/model/DescribeScheduledTasksResult.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				DetachDBInstancesRequest();
 				~DetachDBInstancesRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				std::string getAccessKeyId()const;
@@ -49,6 +51,7 @@ namespace AlibabaCloud
 				void setForceDetach(bool forceDetach);
 
             private:
+				std::string clientToken_;
 				std::string scalingGroupId_;
 				std::string accessKeyId_;
 				std::string resourceOwnerAccount_;

+ 3 - 0
ess/include/alibabacloud/ess/model/DetachDBInstancesResult.h

@@ -51,6 +51,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::vector<std::string> getInstanceId()const;
 				void setInstanceId(const std::vector<std::string>& instanceId);
+				std::string getDetachOption()const;
+				void setDetachOption(const std::string& detachOption);
 
             private:
 				long resourceOwnerId_;
@@ -61,6 +63,7 @@ namespace AlibabaCloud
 				std::string ownerAccount_;
 				long ownerId_;
 				std::vector<std::string> instanceId_;
+				std::string detachOption_;
 
 			};
 		}

+ 3 - 0
ess/include/alibabacloud/ess/model/DetachInstancesResult.h

@@ -35,6 +35,8 @@ namespace AlibabaCloud
 				DetachLoadBalancersRequest();
 				~DetachLoadBalancersRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				std::string getAccessKeyId()const;
@@ -49,6 +51,7 @@ namespace AlibabaCloud
 				void setForceDetach(bool forceDetach);
 
             private:
+				std::string clientToken_;
 				std::string scalingGroupId_;
 				std::string accessKeyId_;
 				std::vector<std::string> loadBalancer_;

+ 3 - 0
ess/include/alibabacloud/ess/model/DetachLoadBalancersResult.h

@@ -46,6 +46,8 @@ namespace AlibabaCloud
 				DetachVServerGroupsRequest();
 				~DetachVServerGroupsRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				std::string getAccessKeyId()const;
@@ -62,6 +64,7 @@ namespace AlibabaCloud
 				void setVServerGroup(const std::vector<VServerGroup>& vServerGroup);
 
             private:
+				std::string clientToken_;
 				std::string scalingGroupId_;
 				std::string accessKeyId_;
 				std::string regionId_;

+ 9 - 6
ess/include/alibabacloud/ess/model/DetachVServerGroupsResult.h

@@ -35,22 +35,25 @@ namespace AlibabaCloud
 				EnterStandbyRequest();
 				~EnterStandbyRequest();
 
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				std::vector<std::string> getInstanceId()const;
 				void setInstanceId(const std::vector<std::string>& instanceId);
 
             private:
-				std::string resourceOwnerAccount_;
+				std::string clientToken_;
 				std::string scalingGroupId_;
-				long ownerId_;
 				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
 				std::vector<std::string> instanceId_;
 
 			};

+ 9 - 6
ess/include/alibabacloud/ess/model/EnterStandbyResult.h

@@ -35,22 +35,25 @@ namespace AlibabaCloud
 				ExitStandbyRequest();
 				~ExitStandbyRequest();
 
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
 				std::vector<std::string> getInstanceId()const;
 				void setInstanceId(const std::vector<std::string>& instanceId);
 
             private:
-				std::string resourceOwnerAccount_;
+				std::string clientToken_;
 				std::string scalingGroupId_;
-				long ownerId_;
 				std::string accessKeyId_;
+				std::string resourceOwnerAccount_;
+				long ownerId_;
 				std::vector<std::string> instanceId_;
 
 			};

+ 3 - 0
ess/include/alibabacloud/ess/model/ExitStandbyResult.h

@@ -51,6 +51,8 @@ namespace AlibabaCloud
 				void setThreshold(float threshold);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getEffective()const;
+				void setEffective(const std::string& effective);
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				int getEvaluationCount()const;
@@ -82,6 +84,7 @@ namespace AlibabaCloud
 				std::vector<std::string> alarmAction_;
 				float threshold_;
 				std::string accessKeyId_;
+				std::string effective_;
 				std::string regionId_;
 				int evaluationCount_;
 				std::string metricName_;

+ 0 - 66
ess/include/alibabacloud/ess/model/ModifyAlarmResult.h

@@ -1,66 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ESS_MODEL_MODIFYALERTCONFIGREQUEST_H_
-#define ALIBABACLOUD_ESS_MODEL_MODIFYALERTCONFIGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/ess/EssExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ess
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ESS_EXPORT ModifyAlertConfigRequest : public RpcServiceRequest
-			{
-
-			public:
-				ModifyAlertConfigRequest();
-				~ModifyAlertConfigRequest();
-
-				int getRejectConfig()const;
-				void setRejectConfig(int rejectConfig);
-				std::string getScalingGroupId()const;
-				void setScalingGroupId(const std::string& scalingGroupId);
-				int getFailConfig()const;
-				void setFailConfig(int failConfig);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getResourceOwnerAccount()const;
-				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				long getOwnerId()const;
-				void setOwnerId(long ownerId);
-				int getSuccessConfig()const;
-				void setSuccessConfig(int successConfig);
-
-            private:
-				int rejectConfig_;
-				std::string scalingGroupId_;
-				int failConfig_;
-				std::string accessKeyId_;
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				int successConfig_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_MODIFYALERTCONFIGREQUEST_H_

+ 0 - 49
ess/include/alibabacloud/ess/model/ModifyAlertConfigResult.h

@@ -1,49 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ALIBABACLOUD_ESS_MODEL_MODIFYALERTCONFIGRESULT_H_
-#define ALIBABACLOUD_ESS_MODEL_MODIFYALERTCONFIGRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/ess/EssExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Ess
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_ESS_EXPORT ModifyAlertConfigResult : public ServiceResult
-			{
-			public:
-
-
-				ModifyAlertConfigResult();
-				explicit ModifyAlertConfigResult(const std::string &payload);
-				~ModifyAlertConfigResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_MODIFYALERTCONFIGRESULT_H_

+ 27 - 0
ess/include/alibabacloud/ess/model/ModifyLifecycleHookRequest.h

@@ -62,12 +62,16 @@ namespace AlibabaCloud
 				void setSpotPriceLimit(const std::vector<SpotPriceLimit>& spotPriceLimit);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getPrivatePoolOptionsMatchCriteria()const;
+				void setPrivatePoolOptionsMatchCriteria(const std::string& privatePoolOptionsMatchCriteria);
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				std::string getInstanceDescription()const;
 				void setInstanceDescription(const std::string& instanceDescription);
 				std::string getSystemDiskAutoSnapshotPolicyId()const;
 				void setSystemDiskAutoSnapshotPolicyId(const std::string& systemDiskAutoSnapshotPolicyId);
+				std::string getPrivatePoolOptionsId()const;
+				void setPrivatePoolOptionsId(const std::string& privatePoolOptionsId);
 				int getIpv6AddressCount()const;
 				void setIpv6AddressCount(int ipv6AddressCount);
 				int getCpu()const;
@@ -86,6 +90,10 @@ namespace AlibabaCloud
 				void setInstanceName(const std::string& instanceName);
 				std::string getInternetChargeType()const;
 				void setInternetChargeType(const std::string& internetChargeType);
+				std::string getZoneId()const;
+				void setZoneId(const std::string& zoneId);
+				std::string getAffinity()const;
+				void setAffinity(const std::string& affinity);
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
 				int getMemory()const;
@@ -110,16 +118,24 @@ namespace AlibabaCloud
 				void setImageName(const std::string& imageName);
 				bool getOverride()const;
 				void setOverride(bool override);
+				std::map<std::string, std::string> getSchedulerOptions()const;
+				void setSchedulerOptions(const std::map<std::string, std::string>& schedulerOptions);
 				std::string getDeploymentSetId()const;
 				void setDeploymentSetId(const std::string& deploymentSetId);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				std::string getTenancy()const;
+				void setTenancy(const std::string& tenancy);
 				std::string getSystemDiskDiskName()const;
 				void setSystemDiskDiskName(const std::string& systemDiskDiskName);
 				std::string getRamRoleName()const;
 				void setRamRoleName(const std::string& ramRoleName);
+				std::string getDedicatedHostId()const;
+				void setDedicatedHostId(const std::string& dedicatedHostId);
+				std::string getCreditSpecification()const;
+				void setCreditSpecification(const std::string& creditSpecification);
 				std::vector<std::string> getSecurityGroupIds()const;
 				void setSecurityGroupIds(const std::vector<std::string>& securityGroupIds);
 				std::vector<DataDisk> getDataDisk()const;
@@ -128,6 +144,8 @@ namespace AlibabaCloud
 				void setLoadBalancerWeight(int loadBalancerWeight);
 				int getSystemDiskSize()const;
 				void setSystemDiskSize(int systemDiskSize);
+				std::string getImageFamily()const;
+				void setImageFamily(const std::string& imageFamily);
 				std::string getSystemDiskDescription()const;
 				void setSystemDiskDescription(const std::string& systemDiskDescription);
 
@@ -136,9 +154,11 @@ namespace AlibabaCloud
 				std::string keyPairName_;
 				std::vector<SpotPriceLimit> spotPriceLimit_;
 				std::string resourceGroupId_;
+				std::string privatePoolOptionsMatchCriteria_;
 				std::string hostName_;
 				std::string instanceDescription_;
 				std::string systemDiskAutoSnapshotPolicyId_;
+				std::string privatePoolOptionsId_;
 				int ipv6AddressCount_;
 				int cpu_;
 				long ownerId_;
@@ -148,6 +168,8 @@ namespace AlibabaCloud
 				std::string spotStrategy_;
 				std::string instanceName_;
 				std::string internetChargeType_;
+				std::string zoneId_;
+				std::string affinity_;
 				std::string imageId_;
 				int memory_;
 				std::string ioOptimized_;
@@ -160,15 +182,20 @@ namespace AlibabaCloud
 				bool passwordInherit_;
 				std::string imageName_;
 				bool override_;
+				std::map<std::string, std::string> schedulerOptions_;
 				std::string deploymentSetId_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
+				std::string tenancy_;
 				std::string systemDiskDiskName_;
 				std::string ramRoleName_;
+				std::string dedicatedHostId_;
+				std::string creditSpecification_;
 				std::vector<std::string> securityGroupIds_;
 				std::vector<DataDisk> dataDisk_;
 				int loadBalancerWeight_;
 				int systemDiskSize_;
+				std::string imageFamily_;
 				std::string systemDiskDescription_;
 
 			};

+ 6 - 0
ess/include/alibabacloud/ess/model/ModifyScalingConfigurationResult.h

@@ -51,6 +51,8 @@ namespace AlibabaCloud
 				void setOnDemandPercentageAboveBaseCapacity(int onDemandPercentageAboveBaseCapacity);
 				bool getSpotInstanceRemedy()const;
 				void setSpotInstanceRemedy(bool spotInstanceRemedy);
+				bool getScaleOutAmountCheck()const;
+				void setScaleOutAmountCheck(bool scaleOutAmountCheck);
 				int getDefaultCooldown()const;
 				void setDefaultCooldown(int defaultCooldown);
 				std::string getRemovalPolicy1()const;
@@ -69,6 +71,8 @@ namespace AlibabaCloud
 				void setScalingGroupName(const std::string& scalingGroupName);
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
+				bool getCompensateWithOnDemand()const;
+				void setCompensateWithOnDemand(bool compensateWithOnDemand);
 				int getSpotInstancePools()const;
 				void setSpotInstancePools(int spotInstancePools);
 				int getMinSize()const;
@@ -91,6 +95,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				int onDemandPercentageAboveBaseCapacity_;
 				bool spotInstanceRemedy_;
+				bool scaleOutAmountCheck_;
 				int defaultCooldown_;
 				std::string removalPolicy1_;
 				std::string removalPolicy2_;
@@ -100,6 +105,7 @@ namespace AlibabaCloud
 				std::string resourceOwnerAccount_;
 				std::string scalingGroupName_;
 				std::string ownerAccount_;
+				bool compensateWithOnDemand_;
 				int spotInstancePools_;
 				int minSize_;
 				bool groupDeletionProtection_;

+ 6 - 0
ess/include/alibabacloud/ess/model/ModifyScalingGroupResult.h

@@ -60,6 +60,8 @@ namespace AlibabaCloud
 				void setCooldown(int cooldown);
 				std::string getPredictiveValueBehavior()const;
 				void setPredictiveValueBehavior(const std::string& predictiveValueBehavior);
+				int getScaleInEvaluationCount()const;
+				void setScaleInEvaluationCount(int scaleInEvaluationCount);
 				std::string getMetricName()const;
 				void setMetricName(const std::string& metricName);
 				std::string getPredictiveScalingMode()const;
@@ -80,6 +82,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				int getPredictiveValueBuffer()const;
 				void setPredictiveValueBuffer(int predictiveValueBuffer);
+				int getScaleOutEvaluationCount()const;
+				void setScaleOutEvaluationCount(int scaleOutEvaluationCount);
 				int getMinAdjustmentMagnitude()const;
 				void setMinAdjustmentMagnitude(int minAdjustmentMagnitude);
 				float getTargetValue()const;
@@ -95,6 +99,7 @@ namespace AlibabaCloud
 				std::string scalingRuleName_;
 				int cooldown_;
 				std::string predictiveValueBehavior_;
+				int scaleInEvaluationCount_;
 				std::string metricName_;
 				std::string predictiveScalingMode_;
 				std::string resourceOwnerAccount_;
@@ -105,6 +110,7 @@ namespace AlibabaCloud
 				std::string adjustmentType_;
 				long ownerId_;
 				int predictiveValueBuffer_;
+				int scaleOutEvaluationCount_;
 				int minAdjustmentMagnitude_;
 				float targetValue_;
 

+ 9 - 6
ess/include/alibabacloud/ess/model/ModifyScalingRuleResult.h

@@ -35,23 +35,26 @@ namespace AlibabaCloud
 				ResumeProcessesRequest();
 				~ResumeProcessesRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
+				std::string getScalingGroupId()const;
+				void setScalingGroupId(const std::string& scalingGroupId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
 				std::vector<std::string> getProcess()const;
 				void setProcess(const std::vector<std::string>& process);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getScalingGroupId()const;
-				void setScalingGroupId(const std::string& scalingGroupId);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 
             private:
+				std::string clientToken_;
+				std::string scalingGroupId_;
+				std::string accessKeyId_;
 				std::vector<std::string> process_;
 				std::string resourceOwnerAccount_;
-				std::string scalingGroupId_;
 				long ownerId_;
-				std::string accessKeyId_;
 
 			};
 		}

+ 9 - 6
ess/include/alibabacloud/ess/model/SetInstancesProtectionRequest.h

@@ -35,23 +35,26 @@ namespace AlibabaCloud
 				SuspendProcessesRequest();
 				~SuspendProcessesRequest();
 
+				std::string getClientToken()const;
+				void setClientToken(const std::string& clientToken);
+				std::string getScalingGroupId()const;
+				void setScalingGroupId(const std::string& scalingGroupId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
 				std::vector<std::string> getProcess()const;
 				void setProcess(const std::vector<std::string>& process);
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
-				std::string getScalingGroupId()const;
-				void setScalingGroupId(const std::string& scalingGroupId);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
 
             private:
+				std::string clientToken_;
+				std::string scalingGroupId_;
+				std::string accessKeyId_;
 				std::vector<std::string> process_;
 				std::string resourceOwnerAccount_;
-				std::string scalingGroupId_;
 				long ownerId_;
-				std::string accessKeyId_;
 
 			};
 		}

+ 3 - 0
ess/include/alibabacloud/ess/model/VerifyAuthenticationRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				bool getOnlyCheck()const;
+				void setOnlyCheck(bool onlyCheck);
 				long getUid()const;
 				void setUid(long uid);
 
@@ -51,6 +53,7 @@ namespace AlibabaCloud
 				std::string resourceOwnerAccount_;
 				long ownerId_;
 				std::string accessKeyId_;
+				bool onlyCheck_;
 				long uid_;
 
 			};

+ 9 - 117
ess/include/alibabacloud/ess/model/VerifyAuthenticationResult.h

@@ -771,42 +771,6 @@ EssClient::DeleteScheduledTaskOutcomeCallable EssClient::deleteScheduledTaskCall
 	return task->get_future();
 }
 
-EssClient::DescribeAccountAttributesOutcome EssClient::describeAccountAttributes(const DescribeAccountAttributesRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeAccountAttributesOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeAccountAttributesOutcome(DescribeAccountAttributesResult(outcome.result()));
-	else
-		return DescribeAccountAttributesOutcome(outcome.error());
-}
-
-void EssClient::describeAccountAttributesAsync(const DescribeAccountAttributesRequest& request, const DescribeAccountAttributesAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeAccountAttributes(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::DescribeAccountAttributesOutcomeCallable EssClient::describeAccountAttributesCallable(const DescribeAccountAttributesRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeAccountAttributesOutcome()>>(
-			[this, request]()
-			{
-			return this->describeAccountAttributes(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EssClient::DescribeAlarmsOutcome EssClient::describeAlarms(const DescribeAlarmsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -843,72 +807,36 @@ EssClient::DescribeAlarmsOutcomeCallable EssClient::describeAlarmsCallable(const
 	return task->get_future();
 }
 
-EssClient::DescribeAlertConfigOutcome EssClient::describeAlertConfig(const DescribeAlertConfigRequest &request) const
+EssClient::DescribeLifecycleActionsOutcome EssClient::describeLifecycleActions(const DescribeLifecycleActionsRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	if (!endpointOutcome.isSuccess())
-		return DescribeAlertConfigOutcome(endpointOutcome.error());
+		return DescribeLifecycleActionsOutcome(endpointOutcome.error());
 
 	auto outcome = makeRequest(endpointOutcome.result(), request);
 
 	if (outcome.isSuccess())
-		return DescribeAlertConfigOutcome(DescribeAlertConfigResult(outcome.result()));
+		return DescribeLifecycleActionsOutcome(DescribeLifecycleActionsResult(outcome.result()));
 	else
-		return DescribeAlertConfigOutcome(outcome.error());
+		return DescribeLifecycleActionsOutcome(outcome.error());
 }
 
-void EssClient::describeAlertConfigAsync(const DescribeAlertConfigRequest& request, const DescribeAlertConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+void EssClient::describeLifecycleActionsAsync(const DescribeLifecycleActionsRequest& request, const DescribeLifecycleActionsAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
 {
 	auto fn = [this, request, handler, context]()
 	{
-		handler(this, request, describeAlertConfig(request), context);
+		handler(this, request, describeLifecycleActions(request), context);
 	};
 
 	asyncExecute(new Runnable(fn));
 }
 
-EssClient::DescribeAlertConfigOutcomeCallable EssClient::describeAlertConfigCallable(const DescribeAlertConfigRequest &request) const
+EssClient::DescribeLifecycleActionsOutcomeCallable EssClient::describeLifecycleActionsCallable(const DescribeLifecycleActionsRequest &request) const
 {
-	auto task = std::make_shared<std::packaged_task<DescribeAlertConfigOutcome()>>(
+	auto task = std::make_shared<std::packaged_task<DescribeLifecycleActionsOutcome()>>(
 			[this, request]()
 			{
-			return this->describeAlertConfig(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
-EssClient::DescribeCapacityHistoryOutcome EssClient::describeCapacityHistory(const DescribeCapacityHistoryRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return DescribeCapacityHistoryOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return DescribeCapacityHistoryOutcome(DescribeCapacityHistoryResult(outcome.result()));
-	else
-		return DescribeCapacityHistoryOutcome(outcome.error());
-}
-
-void EssClient::describeCapacityHistoryAsync(const DescribeCapacityHistoryRequest& request, const DescribeCapacityHistoryAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, describeCapacityHistory(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::DescribeCapacityHistoryOutcomeCallable EssClient::describeCapacityHistoryCallable(const DescribeCapacityHistoryRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<DescribeCapacityHistoryOutcome()>>(
-			[this, request]()
-			{
-			return this->describeCapacityHistory(request);
+			return this->describeLifecycleActions(request);
 			});
 
 	asyncExecute(new Runnable([task]() { (*task)(); }));
@@ -1887,42 +1815,6 @@ EssClient::ModifyAlarmOutcomeCallable EssClient::modifyAlarmCallable(const Modif
 	return task->get_future();
 }
 
-EssClient::ModifyAlertConfigOutcome EssClient::modifyAlertConfig(const ModifyAlertConfigRequest &request) const
-{
-	auto endpointOutcome = endpointProvider_->getEndpoint();
-	if (!endpointOutcome.isSuccess())
-		return ModifyAlertConfigOutcome(endpointOutcome.error());
-
-	auto outcome = makeRequest(endpointOutcome.result(), request);
-
-	if (outcome.isSuccess())
-		return ModifyAlertConfigOutcome(ModifyAlertConfigResult(outcome.result()));
-	else
-		return ModifyAlertConfigOutcome(outcome.error());
-}
-
-void EssClient::modifyAlertConfigAsync(const ModifyAlertConfigRequest& request, const ModifyAlertConfigAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
-{
-	auto fn = [this, request, handler, context]()
-	{
-		handler(this, request, modifyAlertConfig(request), context);
-	};
-
-	asyncExecute(new Runnable(fn));
-}
-
-EssClient::ModifyAlertConfigOutcomeCallable EssClient::modifyAlertConfigCallable(const ModifyAlertConfigRequest &request) const
-{
-	auto task = std::make_shared<std::packaged_task<ModifyAlertConfigOutcome()>>(
-			[this, request]()
-			{
-			return this->modifyAlertConfig(request);
-			});
-
-	asyncExecute(new Runnable([task]() { (*task)(); }));
-	return task->get_future();
-}
-
 EssClient::ModifyLifecycleHookOutcome EssClient::modifyLifecycleHook(const ModifyLifecycleHookRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 11 - 0
ess/src/model/AttachDBInstancesRequest.cc

@@ -27,6 +27,17 @@ AttachDBInstancesRequest::AttachDBInstancesRequest() :
 AttachDBInstancesRequest::~AttachDBInstancesRequest()
 {}
 
+std::string AttachDBInstancesRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void AttachDBInstancesRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string AttachDBInstancesRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;

+ 11 - 0
ess/src/model/AttachDBInstancesResult.cc

@@ -27,6 +27,17 @@ AttachLoadBalancersRequest::AttachLoadBalancersRequest() :
 AttachLoadBalancersRequest::~AttachLoadBalancersRequest()
 {}
 
+std::string AttachLoadBalancersRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void AttachLoadBalancersRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string AttachLoadBalancersRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;

+ 11 - 0
ess/src/model/AttachLoadBalancersResult.cc

@@ -27,6 +27,17 @@ AttachVServerGroupsRequest::AttachVServerGroupsRequest() :
 AttachVServerGroupsRequest::~AttachVServerGroupsRequest()
 {}
 
+std::string AttachVServerGroupsRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void AttachVServerGroupsRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string AttachVServerGroupsRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;

+ 11 - 0
ess/src/model/AttachVServerGroupsResult.cc

@@ -38,6 +38,17 @@ void CompleteLifecycleActionRequest::setLifecycleActionToken(const std::string&
 	setParameter("LifecycleActionToken", lifecycleActionToken);
 }
 
+std::string CompleteLifecycleActionRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void CompleteLifecycleActionRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string CompleteLifecycleActionRequest::getAccessKeyId()const
 {
 	return accessKeyId_;

+ 11 - 0
ess/src/model/CompleteLifecycleActionResult.cc

@@ -95,6 +95,17 @@ void CreateAlarmRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string CreateAlarmRequest::getEffective()const
+{
+	return effective_;
+}
+
+void CreateAlarmRequest::setEffective(const std::string& effective)
+{
+	effective_ = effective;
+	setParameter("Effective", effective);
+}
+
 std::string CreateAlarmRequest::getRegionId()const
 {
 	return regionId_;

+ 0 - 20
ess/src/model/CreateAlarmResult.cc

@@ -148,23 +148,3 @@ void CreateLifecycleHookRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::vector<CreateLifecycleHookRequest::LifecycleHook> CreateLifecycleHookRequest::getLifecycleHook()const
-{
-	return lifecycleHook_;
-}
-
-void CreateLifecycleHookRequest::setLifecycleHook(const std::vector<LifecycleHook>& lifecycleHook)
-{
-	lifecycleHook_ = lifecycleHook;
-	for(int dep1 = 0; dep1!= lifecycleHook.size(); dep1++) {
-		auto lifecycleHookObj = lifecycleHook.at(dep1);
-		std::string lifecycleHookObjStr = "LifecycleHook." + std::to_string(dep1 + 1);
-		setParameter(lifecycleHookObjStr + ".DefaultResult", lifecycleHookObj.defaultResult);
-		setParameter(lifecycleHookObjStr + ".LifecycleHookName", lifecycleHookObj.lifecycleHookName);
-		setParameter(lifecycleHookObjStr + ".HeartbeatTimeout", std::to_string(lifecycleHookObj.heartbeatTimeout));
-		setParameter(lifecycleHookObjStr + ".NotificationArn", lifecycleHookObj.notificationArn);
-		setParameter(lifecycleHookObjStr + ".NotificationMetadata", lifecycleHookObj.notificationMetadata);
-		setParameter(lifecycleHookObjStr + ".LifecycleTransition", lifecycleHookObj.lifecycleTransition);
-	}
-}
-

+ 99 - 0
ess/src/model/CreateLifecycleHookResult.cc

@@ -87,6 +87,17 @@ void CreateScalingConfigurationRequest::setResourceGroupId(const std::string& re
 	setParameter("ResourceGroupId", resourceGroupId);
 }
 
+std::string CreateScalingConfigurationRequest::getPrivatePoolOptionsMatchCriteria()const
+{
+	return privatePoolOptionsMatchCriteria_;
+}
+
+void CreateScalingConfigurationRequest::setPrivatePoolOptionsMatchCriteria(const std::string& privatePoolOptionsMatchCriteria)
+{
+	privatePoolOptionsMatchCriteria_ = privatePoolOptionsMatchCriteria;
+	setParameter("PrivatePoolOptionsMatchCriteria", privatePoolOptionsMatchCriteria);
+}
+
 std::string CreateScalingConfigurationRequest::getHostName()const
 {
 	return hostName_;
@@ -131,6 +142,17 @@ void CreateScalingConfigurationRequest::setSystemDiskAutoSnapshotPolicyId(const
 	setParameter("SystemDiskAutoSnapshotPolicyId", systemDiskAutoSnapshotPolicyId);
 }
 
+std::string CreateScalingConfigurationRequest::getPrivatePoolOptionsId()const
+{
+	return privatePoolOptionsId_;
+}
+
+void CreateScalingConfigurationRequest::setPrivatePoolOptionsId(const std::string& privatePoolOptionsId)
+{
+	privatePoolOptionsId_ = privatePoolOptionsId;
+	setParameter("PrivatePoolOptionsId", privatePoolOptionsId);
+}
+
 int CreateScalingConfigurationRequest::getIpv6AddressCount()const
 {
 	return ipv6AddressCount_;
@@ -219,6 +241,17 @@ void CreateScalingConfigurationRequest::setInternetChargeType(const std::string&
 	setParameter("InternetChargeType", internetChargeType);
 }
 
+std::string CreateScalingConfigurationRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void CreateScalingConfigurationRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+
 int CreateScalingConfigurationRequest::getInternetMaxBandwidthIn()const
 {
 	return internetMaxBandwidthIn_;
@@ -230,6 +263,17 @@ void CreateScalingConfigurationRequest::setInternetMaxBandwidthIn(int internetMa
 	setParameter("InternetMaxBandwidthIn", std::to_string(internetMaxBandwidthIn));
 }
 
+std::string CreateScalingConfigurationRequest::getAffinity()const
+{
+	return affinity_;
+}
+
+void CreateScalingConfigurationRequest::setAffinity(const std::string& affinity)
+{
+	affinity_ = affinity;
+	setParameter("Affinity", affinity);
+}
+
 std::string CreateScalingConfigurationRequest::getImageId()const
 {
 	return imageId_;
@@ -386,6 +430,17 @@ void CreateScalingConfigurationRequest::setInstanceType(const std::string& insta
 	setParameter("InstanceType", instanceType);
 }
 
+std::map<std::string, std::string> CreateScalingConfigurationRequest::getSchedulerOptions()const
+{
+	return schedulerOptions_;
+}
+
+void CreateScalingConfigurationRequest::setSchedulerOptions(const std::map<std::string, std::string>& schedulerOptions)
+{
+	schedulerOptions_ = schedulerOptions;
+	setJsonParameters("SchedulerOptions", schedulerOptions);
+}
+
 std::string CreateScalingConfigurationRequest::getDeploymentSetId()const
 {
 	return deploymentSetId_;
@@ -419,6 +474,17 @@ void CreateScalingConfigurationRequest::setOwnerAccount(const std::string& owner
 	setParameter("OwnerAccount", ownerAccount);
 }
 
+std::string CreateScalingConfigurationRequest::getTenancy()const
+{
+	return tenancy_;
+}
+
+void CreateScalingConfigurationRequest::setTenancy(const std::string& tenancy)
+{
+	tenancy_ = tenancy;
+	setParameter("Tenancy", tenancy);
+}
+
 std::string CreateScalingConfigurationRequest::getSystemDiskDiskName()const
 {
 	return systemDiskDiskName_;
@@ -441,6 +507,28 @@ void CreateScalingConfigurationRequest::setRamRoleName(const std::string& ramRol
 	setParameter("RamRoleName", ramRoleName);
 }
 
+std::string CreateScalingConfigurationRequest::getDedicatedHostId()const
+{
+	return dedicatedHostId_;
+}
+
+void CreateScalingConfigurationRequest::setDedicatedHostId(const std::string& dedicatedHostId)
+{
+	dedicatedHostId_ = dedicatedHostId;
+	setParameter("DedicatedHostId", dedicatedHostId);
+}
+
+std::string CreateScalingConfigurationRequest::getCreditSpecification()const
+{
+	return creditSpecification_;
+}
+
+void CreateScalingConfigurationRequest::setCreditSpecification(const std::string& creditSpecification)
+{
+	creditSpecification_ = creditSpecification;
+	setParameter("CreditSpecification", creditSpecification);
+}
+
 std::vector<std::string> CreateScalingConfigurationRequest::getSecurityGroupIds()const
 {
 	return securityGroupIds_;
@@ -500,6 +588,17 @@ void CreateScalingConfigurationRequest::setSystemDiskSize(int systemDiskSize)
 	setParameter("SystemDiskSize", std::to_string(systemDiskSize));
 }
 
+std::string CreateScalingConfigurationRequest::getImageFamily()const
+{
+	return imageFamily_;
+}
+
+void CreateScalingConfigurationRequest::setImageFamily(const std::string& imageFamily)
+{
+	imageFamily_ = imageFamily;
+	setParameter("ImageFamily", imageFamily);
+}
+
 std::string CreateScalingConfigurationRequest::getSystemDiskDescription()const
 {
 	return systemDiskDescription_;

+ 22 - 0
ess/src/model/CreateScalingConfigurationResult.cc

@@ -51,6 +51,17 @@ void CreateScalingGroupRequest::setSpotInstanceRemedy(bool spotInstanceRemedy)
 	setParameter("SpotInstanceRemedy", spotInstanceRemedy ? "true" : "false");
 }
 
+bool CreateScalingGroupRequest::getScaleOutAmountCheck()const
+{
+	return scaleOutAmountCheck_;
+}
+
+void CreateScalingGroupRequest::setScaleOutAmountCheck(bool scaleOutAmountCheck)
+{
+	scaleOutAmountCheck_ = scaleOutAmountCheck;
+	setParameter("ScaleOutAmountCheck", scaleOutAmountCheck ? "true" : "false");
+}
+
 std::vector<CreateScalingGroupRequest::Tag> CreateScalingGroupRequest::getTag()const
 {
 	return tag_;
@@ -122,6 +133,17 @@ void CreateScalingGroupRequest::setDesiredCapacity(int desiredCapacity)
 	setParameter("DesiredCapacity", std::to_string(desiredCapacity));
 }
 
+bool CreateScalingGroupRequest::getCompensateWithOnDemand()const
+{
+	return compensateWithOnDemand_;
+}
+
+void CreateScalingGroupRequest::setCompensateWithOnDemand(bool compensateWithOnDemand)
+{
+	compensateWithOnDemand_ = compensateWithOnDemand;
+	setParameter("CompensateWithOnDemand", compensateWithOnDemand ? "true" : "false");
+}
+
 int CreateScalingGroupRequest::getMinSize()const
 {
 	return minSize_;

+ 22 - 0
ess/src/model/CreateScalingGroupResult.cc

@@ -121,6 +121,17 @@ void CreateScalingRuleRequest::setPredictiveValueBehavior(const std::string& pre
 	setParameter("PredictiveValueBehavior", predictiveValueBehavior);
 }
 
+int CreateScalingRuleRequest::getScaleInEvaluationCount()const
+{
+	return scaleInEvaluationCount_;
+}
+
+void CreateScalingRuleRequest::setScaleInEvaluationCount(int scaleInEvaluationCount)
+{
+	scaleInEvaluationCount_ = scaleInEvaluationCount;
+	setParameter("ScaleInEvaluationCount", std::to_string(scaleInEvaluationCount));
+}
+
 std::string CreateScalingRuleRequest::getScalingRuleType()const
 {
 	return scalingRuleType_;
@@ -242,6 +253,17 @@ void CreateScalingRuleRequest::setPredictiveValueBuffer(int predictiveValueBuffe
 	setParameter("PredictiveValueBuffer", std::to_string(predictiveValueBuffer));
 }
 
+int CreateScalingRuleRequest::getScaleOutEvaluationCount()const
+{
+	return scaleOutEvaluationCount_;
+}
+
+void CreateScalingRuleRequest::setScaleOutEvaluationCount(int scaleOutEvaluationCount)
+{
+	scaleOutEvaluationCount_ = scaleOutEvaluationCount;
+	setParameter("ScaleOutEvaluationCount", std::to_string(scaleOutEvaluationCount));
+}
+
 int CreateScalingRuleRequest::getMinAdjustmentMagnitude()const
 {
 	return minAdjustmentMagnitude_;

+ 0 - 60
ess/src/model/CreateScalingRuleResult.cc

@@ -1,60 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/DescribeAccountAttributesRequest.h>
-
-using AlibabaCloud::Ess::Model::DescribeAccountAttributesRequest;
-
-DescribeAccountAttributesRequest::DescribeAccountAttributesRequest() :
-	RpcServiceRequest("ess", "2014-08-28", "DescribeAccountAttributes")
-{}
-
-DescribeAccountAttributesRequest::~DescribeAccountAttributesRequest()
-{}
-
-std::string DescribeAccountAttributesRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeAccountAttributesRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-long DescribeAccountAttributesRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeAccountAttributesRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeAccountAttributesRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeAccountAttributesRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

+ 0 - 108
ess/src/model/DescribeAccountAttributesResult.cc

@@ -1,108 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/DescribeAccountAttributesResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Ess;
-using namespace AlibabaCloud::Ess::Model;
-
-DescribeAccountAttributesResult::DescribeAccountAttributesResult() :
-	ServiceResult()
-{}
-
-DescribeAccountAttributesResult::DescribeAccountAttributesResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeAccountAttributesResult::~DescribeAccountAttributesResult()
-{}
-
-void DescribeAccountAttributesResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-
-	setRequestId(value["RequestId"].asString());
-	if(!value["MaxNumberOfScalingGroups"].isNull())
-		maxNumberOfScalingGroups_ = std::stoi(value["MaxNumberOfScalingGroups"].asString());
-	if(!value["MaxNumberOfScalingConfigurations"].isNull())
-		maxNumberOfScalingConfigurations_ = std::stoi(value["MaxNumberOfScalingConfigurations"].asString());
-	if(!value["MaxNumberOfScalingRules"].isNull())
-		maxNumberOfScalingRules_ = std::stoi(value["MaxNumberOfScalingRules"].asString());
-	if(!value["MaxNumberOfScheduledTasks"].isNull())
-		maxNumberOfScheduledTasks_ = std::stoi(value["MaxNumberOfScheduledTasks"].asString());
-	if(!value["MaxNumberOfScalingInstances"].isNull())
-		maxNumberOfScalingInstances_ = std::stoi(value["MaxNumberOfScalingInstances"].asString());
-	if(!value["MaxNumberOfDBInstances"].isNull())
-		maxNumberOfDBInstances_ = std::stoi(value["MaxNumberOfDBInstances"].asString());
-	if(!value["MaxNumberOfLoadBalancers"].isNull())
-		maxNumberOfLoadBalancers_ = std::stoi(value["MaxNumberOfLoadBalancers"].asString());
-	if(!value["MaxNumberOfMinSize"].isNull())
-		maxNumberOfMinSize_ = std::stoi(value["MaxNumberOfMinSize"].asString());
-	if(!value["MaxNumberOfMaxSize"].isNull())
-		maxNumberOfMaxSize_ = std::stoi(value["MaxNumberOfMaxSize"].asString());
-
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfScalingRules()const
-{
-	return maxNumberOfScalingRules_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfScalingInstances()const
-{
-	return maxNumberOfScalingInstances_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfScheduledTasks()const
-{
-	return maxNumberOfScheduledTasks_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfLoadBalancers()const
-{
-	return maxNumberOfLoadBalancers_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfMinSize()const
-{
-	return maxNumberOfMinSize_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfScalingGroups()const
-{
-	return maxNumberOfScalingGroups_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfScalingConfigurations()const
-{
-	return maxNumberOfScalingConfigurations_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfDBInstances()const
-{
-	return maxNumberOfDBInstances_;
-}
-
-int DescribeAccountAttributesResult::getMaxNumberOfMaxSize()const
-{
-	return maxNumberOfMaxSize_;
-}
-

+ 2 - 0
ess/src/model/DescribeAlarmsRequest.cc

@@ -69,6 +69,8 @@ void DescribeAlarmsResult::parse(const std::string &payload)
 			alarmListObject.scalingGroupId = valueAlarmListAlarm["ScalingGroupId"].asString();
 		if(!valueAlarmListAlarm["Enable"].isNull())
 			alarmListObject.enable = valueAlarmListAlarm["Enable"].asString() == "true";
+		if(!valueAlarmListAlarm["Effective"].isNull())
+			alarmListObject.effective = valueAlarmListAlarm["Effective"].asString();
 		auto allDimensionsNode = allAlarmListNode["Dimensions"]["Dimension"];
 		for (auto allAlarmListNodeDimensionsDimension : allDimensionsNode)
 		{

+ 0 - 71
ess/src/model/DescribeAlertConfigRequest.cc

@@ -1,71 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/DescribeAlertConfigRequest.h>
-
-using AlibabaCloud::Ess::Model::DescribeAlertConfigRequest;
-
-DescribeAlertConfigRequest::DescribeAlertConfigRequest() :
-	RpcServiceRequest("ess", "2014-08-28", "DescribeAlertConfig")
-{}
-
-DescribeAlertConfigRequest::~DescribeAlertConfigRequest()
-{}
-
-std::string DescribeAlertConfigRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeAlertConfigRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeAlertConfigRequest::getScalingGroupId()const
-{
-	return scalingGroupId_;
-}
-
-void DescribeAlertConfigRequest::setScalingGroupId(const std::string& scalingGroupId)
-{
-	scalingGroupId_ = scalingGroupId;
-	setCoreParameter("ScalingGroupId", scalingGroupId);
-}
-
-long DescribeAlertConfigRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeAlertConfigRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeAlertConfigRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeAlertConfigRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-

+ 0 - 65
ess/src/model/DescribeAlertConfigResult.cc

@@ -1,65 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/DescribeAlertConfigResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Ess;
-using namespace AlibabaCloud::Ess::Model;
-
-DescribeAlertConfigResult::DescribeAlertConfigResult() :
-	ServiceResult()
-{}
-
-DescribeAlertConfigResult::DescribeAlertConfigResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeAlertConfigResult::~DescribeAlertConfigResult()
-{}
-
-void DescribeAlertConfigResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	if(!value["SuccessConfig"].isNull())
-		successConfig_ = std::stoi(value["SuccessConfig"].asString());
-	if(!value["FailConfig"].isNull())
-		failConfig_ = std::stoi(value["FailConfig"].asString());
-	if(!value["RejectConfig"].isNull())
-		rejectConfig_ = std::stoi(value["RejectConfig"].asString());
-
-}
-
-int DescribeAlertConfigResult::getFailConfig()const
-{
-	return failConfig_;
-}
-
-int DescribeAlertConfigResult::getRejectConfig()const
-{
-	return rejectConfig_;
-}
-
-int DescribeAlertConfigResult::getSuccessConfig()const
-{
-	return successConfig_;
-}
-

+ 0 - 115
ess/src/model/DescribeCapacityHistoryRequest.cc

@@ -1,115 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/DescribeCapacityHistoryRequest.h>
-
-using AlibabaCloud::Ess::Model::DescribeCapacityHistoryRequest;
-
-DescribeCapacityHistoryRequest::DescribeCapacityHistoryRequest() :
-	RpcServiceRequest("ess", "2014-08-28", "DescribeCapacityHistory")
-{}
-
-DescribeCapacityHistoryRequest::~DescribeCapacityHistoryRequest()
-{}
-
-std::string DescribeCapacityHistoryRequest::getScalingGroupId()const
-{
-	return scalingGroupId_;
-}
-
-void DescribeCapacityHistoryRequest::setScalingGroupId(const std::string& scalingGroupId)
-{
-	scalingGroupId_ = scalingGroupId;
-	setCoreParameter("ScalingGroupId", scalingGroupId);
-}
-
-std::string DescribeCapacityHistoryRequest::getStartTime()const
-{
-	return startTime_;
-}
-
-void DescribeCapacityHistoryRequest::setStartTime(const std::string& startTime)
-{
-	startTime_ = startTime;
-	setCoreParameter("StartTime", startTime);
-}
-
-int DescribeCapacityHistoryRequest::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-void DescribeCapacityHistoryRequest::setPageNumber(int pageNumber)
-{
-	pageNumber_ = pageNumber;
-	setCoreParameter("PageNumber", std::to_string(pageNumber));
-}
-
-std::string DescribeCapacityHistoryRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeCapacityHistoryRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-
-int DescribeCapacityHistoryRequest::getPageSize()const
-{
-	return pageSize_;
-}
-
-void DescribeCapacityHistoryRequest::setPageSize(int pageSize)
-{
-	pageSize_ = pageSize;
-	setCoreParameter("PageSize", std::to_string(pageSize));
-}
-
-std::string DescribeCapacityHistoryRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void DescribeCapacityHistoryRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-std::string DescribeCapacityHistoryRequest::getEndTime()const
-{
-	return endTime_;
-}
-
-void DescribeCapacityHistoryRequest::setEndTime(const std::string& endTime)
-{
-	endTime_ = endTime;
-	setCoreParameter("EndTime", endTime);
-}
-
-long DescribeCapacityHistoryRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeCapacityHistoryRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-

+ 0 - 86
ess/src/model/DescribeCapacityHistoryResult.cc

@@ -1,86 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/DescribeCapacityHistoryResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Ess;
-using namespace AlibabaCloud::Ess::Model;
-
-DescribeCapacityHistoryResult::DescribeCapacityHistoryResult() :
-	ServiceResult()
-{}
-
-DescribeCapacityHistoryResult::DescribeCapacityHistoryResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-DescribeCapacityHistoryResult::~DescribeCapacityHistoryResult()
-{}
-
-void DescribeCapacityHistoryResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-	auto allCapacityHistoryItemsNode = value["CapacityHistoryItems"]["CapacityHistoryModel"];
-	for (auto valueCapacityHistoryItemsCapacityHistoryModel : allCapacityHistoryItemsNode)
-	{
-		CapacityHistoryModel capacityHistoryItemsObject;
-		if(!valueCapacityHistoryItemsCapacityHistoryModel["ScalingGroupId"].isNull())
-			capacityHistoryItemsObject.scalingGroupId = valueCapacityHistoryItemsCapacityHistoryModel["ScalingGroupId"].asString();
-		if(!valueCapacityHistoryItemsCapacityHistoryModel["TotalCapacity"].isNull())
-			capacityHistoryItemsObject.totalCapacity = std::stoi(valueCapacityHistoryItemsCapacityHistoryModel["TotalCapacity"].asString());
-		if(!valueCapacityHistoryItemsCapacityHistoryModel["AttachedCapacity"].isNull())
-			capacityHistoryItemsObject.attachedCapacity = std::stoi(valueCapacityHistoryItemsCapacityHistoryModel["AttachedCapacity"].asString());
-		if(!valueCapacityHistoryItemsCapacityHistoryModel["AutoCreatedCapacity"].isNull())
-			capacityHistoryItemsObject.autoCreatedCapacity = std::stoi(valueCapacityHistoryItemsCapacityHistoryModel["AutoCreatedCapacity"].asString());
-		if(!valueCapacityHistoryItemsCapacityHistoryModel["Timestamp"].isNull())
-			capacityHistoryItemsObject.timestamp = valueCapacityHistoryItemsCapacityHistoryModel["Timestamp"].asString();
-		capacityHistoryItems_.push_back(capacityHistoryItemsObject);
-	}
-	if(!value["TotalCount"].isNull())
-		totalCount_ = std::stoi(value["TotalCount"].asString());
-	if(!value["PageNumber"].isNull())
-		pageNumber_ = std::stoi(value["PageNumber"].asString());
-	if(!value["PageSize"].isNull())
-		pageSize_ = std::stoi(value["PageSize"].asString());
-
-}
-
-int DescribeCapacityHistoryResult::getTotalCount()const
-{
-	return totalCount_;
-}
-
-int DescribeCapacityHistoryResult::getPageSize()const
-{
-	return pageSize_;
-}
-
-int DescribeCapacityHistoryResult::getPageNumber()const
-{
-	return pageNumber_;
-}
-
-std::vector<DescribeCapacityHistoryResult::CapacityHistoryModel> DescribeCapacityHistoryResult::getCapacityHistoryItems()const
-{
-	return capacityHistoryItems_;
-}
-

+ 106 - 0
ess/src/model/DescribeLifecycleActionsRequest.cc

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/ess/model/DescribeLifecycleActionsRequest.h>
+
+using AlibabaCloud::Ess::Model::DescribeLifecycleActionsRequest;
+
+DescribeLifecycleActionsRequest::DescribeLifecycleActionsRequest() :
+	RpcServiceRequest("ess", "2014-08-28", "DescribeLifecycleActions")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeLifecycleActionsRequest::~DescribeLifecycleActionsRequest()
+{}
+
+std::string DescribeLifecycleActionsRequest::getLifecycleActionStatus()const
+{
+	return lifecycleActionStatus_;
+}
+
+void DescribeLifecycleActionsRequest::setLifecycleActionStatus(const std::string& lifecycleActionStatus)
+{
+	lifecycleActionStatus_ = lifecycleActionStatus;
+	setParameter("LifecycleActionStatus", lifecycleActionStatus);
+}
+
+std::string DescribeLifecycleActionsRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void DescribeLifecycleActionsRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string DescribeLifecycleActionsRequest::getNextToken()const
+{
+	return nextToken_;
+}
+
+void DescribeLifecycleActionsRequest::setNextToken(const std::string& nextToken)
+{
+	nextToken_ = nextToken;
+	setParameter("NextToken", nextToken);
+}
+
+std::string DescribeLifecycleActionsRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void DescribeLifecycleActionsRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long DescribeLifecycleActionsRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeLifecycleActionsRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DescribeLifecycleActionsRequest::getScalingActivityId()const
+{
+	return scalingActivityId_;
+}
+
+void DescribeLifecycleActionsRequest::setScalingActivityId(const std::string& scalingActivityId)
+{
+	scalingActivityId_ = scalingActivityId;
+	setParameter("ScalingActivityId", scalingActivityId);
+}
+
+int DescribeLifecycleActionsRequest::getMaxResults()const
+{
+	return maxResults_;
+}
+
+void DescribeLifecycleActionsRequest::setMaxResults(int maxResults)
+{
+	maxResults_ = maxResults;
+	setParameter("MaxResults", std::to_string(maxResults));
+}
+

+ 87 - 0
ess/src/model/DescribeLifecycleActionsResult.cc

@@ -0,0 +1,87 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/ess/model/DescribeLifecycleActionsResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Ess;
+using namespace AlibabaCloud::Ess::Model;
+
+DescribeLifecycleActionsResult::DescribeLifecycleActionsResult() :
+	ServiceResult()
+{}
+
+DescribeLifecycleActionsResult::DescribeLifecycleActionsResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeLifecycleActionsResult::~DescribeLifecycleActionsResult()
+{}
+
+void DescribeLifecycleActionsResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allLifecycleActionsNode = value["LifecycleActions"]["LifecycleAction"];
+	for (auto valueLifecycleActionsLifecycleAction : allLifecycleActionsNode)
+	{
+		LifecycleAction lifecycleActionsObject;
+		if(!valueLifecycleActionsLifecycleAction["LifecycleActionToken"].isNull())
+			lifecycleActionsObject.lifecycleActionToken = valueLifecycleActionsLifecycleAction["LifecycleActionToken"].asString();
+		if(!valueLifecycleActionsLifecycleAction["LifecycleActionStatus"].isNull())
+			lifecycleActionsObject.lifecycleActionStatus = valueLifecycleActionsLifecycleAction["LifecycleActionStatus"].asString();
+		if(!valueLifecycleActionsLifecycleAction["LifecycleActionResult"].isNull())
+			lifecycleActionsObject.lifecycleActionResult = valueLifecycleActionsLifecycleAction["LifecycleActionResult"].asString();
+		if(!valueLifecycleActionsLifecycleAction["LifecycleHookId"].isNull())
+			lifecycleActionsObject.lifecycleHookId = valueLifecycleActionsLifecycleAction["LifecycleHookId"].asString();
+		auto allInstanceIds = value["InstanceIds"]["InstanceId"];
+		for (auto value : allInstanceIds)
+			lifecycleActionsObject.instanceIds.push_back(value.asString());
+		lifecycleActions_.push_back(lifecycleActionsObject);
+	}
+	if(!value["NextToken"].isNull())
+		nextToken_ = value["NextToken"].asString();
+	if(!value["MaxResults"].isNull())
+		maxResults_ = std::stoi(value["MaxResults"].asString());
+	if(!value["TotalCount"].isNull())
+		totalCount_ = std::stoi(value["TotalCount"].asString());
+
+}
+
+int DescribeLifecycleActionsResult::getTotalCount()const
+{
+	return totalCount_;
+}
+
+std::string DescribeLifecycleActionsResult::getNextToken()const
+{
+	return nextToken_;
+}
+
+int DescribeLifecycleActionsResult::getMaxResults()const
+{
+	return maxResults_;
+}
+
+std::vector<DescribeLifecycleActionsResult::LifecycleAction> DescribeLifecycleActionsResult::getLifecycleActions()const
+{
+	return lifecycleActions_;
+}
+

+ 19 - 0
ess/src/model/DescribeLifecycleHooksRequest.cc

@@ -111,6 +111,22 @@ void DescribeScalingConfigurationsResult::parse(const std::string &payload)
 			scalingConfigurationsObject.hpcClusterId = valueScalingConfigurationsScalingConfiguration["HpcClusterId"].asString();
 		if(!valueScalingConfigurationsScalingConfiguration["InstanceDescription"].isNull())
 			scalingConfigurationsObject.instanceDescription = valueScalingConfigurationsScalingConfiguration["InstanceDescription"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["CreditSpecification"].isNull())
+			scalingConfigurationsObject.creditSpecification = valueScalingConfigurationsScalingConfiguration["CreditSpecification"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["ImageFamily"].isNull())
+			scalingConfigurationsObject.imageFamily = valueScalingConfigurationsScalingConfiguration["ImageFamily"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["ZoneId"].isNull())
+			scalingConfigurationsObject.zoneId = valueScalingConfigurationsScalingConfiguration["ZoneId"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["DedicatedHostId"].isNull())
+			scalingConfigurationsObject.dedicatedHostId = valueScalingConfigurationsScalingConfiguration["DedicatedHostId"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["Affinity"].isNull())
+			scalingConfigurationsObject.affinity = valueScalingConfigurationsScalingConfiguration["Affinity"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["Tenancy"].isNull())
+			scalingConfigurationsObject.tenancy = valueScalingConfigurationsScalingConfiguration["Tenancy"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["PrivatePoolOptions.MatchCriteria"].isNull())
+			scalingConfigurationsObject.privatePoolOptionsMatchCriteria = valueScalingConfigurationsScalingConfiguration["PrivatePoolOptions.MatchCriteria"].asString();
+		if(!valueScalingConfigurationsScalingConfiguration["PrivatePoolOptions.Id"].isNull())
+			scalingConfigurationsObject.privatePoolOptionsId = valueScalingConfigurationsScalingConfiguration["PrivatePoolOptions.Id"].asString();
 		if(!valueScalingConfigurationsScalingConfiguration["Ipv6AddressCount"].isNull())
 			scalingConfigurationsObject.ipv6AddressCount = std::stoi(valueScalingConfigurationsScalingConfiguration["Ipv6AddressCount"].asString());
 		auto allDataDisksNode = allScalingConfigurationsNode["DataDisks"]["DataDisk"];
@@ -159,6 +175,9 @@ void DescribeScalingConfigurationsResult::parse(const std::string &payload)
 				spotPriceLimitObject.priceLimit = std::stof(allScalingConfigurationsNodeSpotPriceLimitSpotPriceModel["PriceLimit"].asString());
 			scalingConfigurationsObject.spotPriceLimit.push_back(spotPriceLimitObject);
 		}
+		auto schedulerOptionsNode = value["SchedulerOptions"];
+		if(!schedulerOptionsNode["ManagedPrivateSpaceId"].isNull())
+			scalingConfigurationsObject.schedulerOptions.managedPrivateSpaceId = schedulerOptionsNode["ManagedPrivateSpaceId"].asString();
 		auto allInstanceTypes = value["InstanceTypes"]["InstanceType"];
 		for (auto value : allInstanceTypes)
 			scalingConfigurationsObject.instanceTypes.push_back(value.asString());

+ 4 - 0
ess/src/model/DescribeScalingGroupsRequest.cc

@@ -101,12 +101,16 @@ void DescribeScalingGroupsResult::parse(const std::string &payload)
 			scalingGroupsObject.onDemandPercentageAboveBaseCapacity = std::stoi(valueScalingGroupsScalingGroup["OnDemandPercentageAboveBaseCapacity"].asString());
 		if(!valueScalingGroupsScalingGroup["SpotInstanceRemedy"].isNull())
 			scalingGroupsObject.spotInstanceRemedy = valueScalingGroupsScalingGroup["SpotInstanceRemedy"].asString() == "true";
+		if(!valueScalingGroupsScalingGroup["CompensateWithOnDemand"].isNull())
+			scalingGroupsObject.compensateWithOnDemand = valueScalingGroupsScalingGroup["CompensateWithOnDemand"].asString() == "true";
 		if(!valueScalingGroupsScalingGroup["SpotInstancePools"].isNull())
 			scalingGroupsObject.spotInstancePools = std::stoi(valueScalingGroupsScalingGroup["SpotInstancePools"].asString());
 		if(!valueScalingGroupsScalingGroup["DesiredCapacity"].isNull())
 			scalingGroupsObject.desiredCapacity = std::stoi(valueScalingGroupsScalingGroup["DesiredCapacity"].asString());
 		if(!valueScalingGroupsScalingGroup["GroupDeletionProtection"].isNull())
 			scalingGroupsObject.groupDeletionProtection = valueScalingGroupsScalingGroup["GroupDeletionProtection"].asString() == "true";
+		if(!valueScalingGroupsScalingGroup["ScaleOutAmountCheck"].isNull())
+			scalingGroupsObject.scaleOutAmountCheck = valueScalingGroupsScalingGroup["ScaleOutAmountCheck"].asString() == "true";
 		auto allVServerGroupsNode = allScalingGroupsNode["VServerGroups"]["VServerGroup"];
 		for (auto allScalingGroupsNodeVServerGroupsVServerGroup : allVServerGroupsNode)
 		{

+ 2 - 0
ess/src/model/DescribeScalingInstancesRequest.cc

@@ -67,6 +67,8 @@ void DescribeScalingInstancesResult::parse(const std::string &payload)
 			scalingInstancesObject.warmupState = valueScalingInstancesScalingInstance["WarmupState"].asString();
 		if(!valueScalingInstancesScalingInstance["Entrusted"].isNull())
 			scalingInstancesObject.entrusted = valueScalingInstancesScalingInstance["Entrusted"].asString() == "true";
+		if(!valueScalingInstancesScalingInstance["CreatedTime"].isNull())
+			scalingInstancesObject.createdTime = valueScalingInstancesScalingInstance["CreatedTime"].asString();
 		scalingInstances_.push_back(scalingInstancesObject);
 	}
 	if(!value["TotalCount"].isNull())

+ 4 - 0
ess/src/model/DescribeScalingRulesRequest.cc

@@ -73,6 +73,10 @@ void DescribeScalingRulesResult::parse(const std::string &payload)
 			scalingRulesObject.targetValue = std::stof(valueScalingRulesScalingRule["TargetValue"].asString());
 		if(!valueScalingRulesScalingRule["DisableScaleIn"].isNull())
 			scalingRulesObject.disableScaleIn = valueScalingRulesScalingRule["DisableScaleIn"].asString() == "true";
+		if(!valueScalingRulesScalingRule["ScaleInEvaluationCount"].isNull())
+			scalingRulesObject.scaleInEvaluationCount = std::stoi(valueScalingRulesScalingRule["ScaleInEvaluationCount"].asString());
+		if(!valueScalingRulesScalingRule["ScaleOutEvaluationCount"].isNull())
+			scalingRulesObject.scaleOutEvaluationCount = std::stoi(valueScalingRulesScalingRule["ScaleOutEvaluationCount"].asString());
 		if(!valueScalingRulesScalingRule["PredictiveScalingMode"].isNull())
 			scalingRulesObject.predictiveScalingMode = valueScalingRulesScalingRule["PredictiveScalingMode"].asString();
 		if(!valueScalingRulesScalingRule["PredictiveValueBehavior"].isNull())

+ 11 - 0
ess/src/model/DescribeScheduledTasksRequest.cc

@@ -192,6 +192,17 @@ void DescribeScheduledTasksRequest::setScheduledTaskId20(const std::string& sche
 	setParameter("ScheduledTaskId20", scheduledTaskId20);
 }
 
+std::string DescribeScheduledTasksRequest::getScalingGroupId()const
+{
+	return scalingGroupId_;
+}
+
+void DescribeScheduledTasksRequest::setScalingGroupId(const std::string& scalingGroupId)
+{
+	scalingGroupId_ = scalingGroupId;
+	setParameter("ScalingGroupId", scalingGroupId);
+}
+
 std::string DescribeScheduledTasksRequest::getScheduledTaskName13()const
 {
 	return scheduledTaskName13_;

+ 11 - 0
ess/src/model/DescribeScheduledTasksResult.cc

@@ -27,6 +27,17 @@ DetachDBInstancesRequest::DetachDBInstancesRequest() :
 DetachDBInstancesRequest::~DetachDBInstancesRequest()
 {}
 
+std::string DetachDBInstancesRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void DetachDBInstancesRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string DetachDBInstancesRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;

+ 11 - 0
ess/src/model/DetachDBInstancesResult.cc

@@ -117,3 +117,14 @@ void DetachInstancesRequest::setInstanceId(const std::vector<std::string>& insta
 	}
 }
 
+std::string DetachInstancesRequest::getDetachOption()const
+{
+	return detachOption_;
+}
+
+void DetachInstancesRequest::setDetachOption(const std::string& detachOption)
+{
+	detachOption_ = detachOption;
+	setParameter("DetachOption", detachOption);
+}
+

+ 11 - 0
ess/src/model/DetachInstancesResult.cc

@@ -27,6 +27,17 @@ DetachLoadBalancersRequest::DetachLoadBalancersRequest() :
 DetachLoadBalancersRequest::~DetachLoadBalancersRequest()
 {}
 
+std::string DetachLoadBalancersRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void DetachLoadBalancersRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string DetachLoadBalancersRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;

+ 11 - 0
ess/src/model/DetachLoadBalancersResult.cc

@@ -27,6 +27,17 @@ DetachVServerGroupsRequest::DetachVServerGroupsRequest() :
 DetachVServerGroupsRequest::~DetachVServerGroupsRequest()
 {}
 
+std::string DetachVServerGroupsRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void DetachVServerGroupsRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
 std::string DetachVServerGroupsRequest::getScalingGroupId()const
 {
 	return scalingGroupId_;

+ 26 - 15
ess/src/model/DetachVServerGroupsResult.cc

@@ -27,15 +27,15 @@ EnterStandbyRequest::EnterStandbyRequest() :
 EnterStandbyRequest::~EnterStandbyRequest()
 {}
 
-std::string EnterStandbyRequest::getResourceOwnerAccount()const
+std::string EnterStandbyRequest::getClientToken()const
 {
-	return resourceOwnerAccount_;
+	return clientToken_;
 }
 
-void EnterStandbyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+void EnterStandbyRequest::setClientToken(const std::string& clientToken)
 {
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
 }
 
 std::string EnterStandbyRequest::getScalingGroupId()const
@@ -49,26 +49,37 @@ void EnterStandbyRequest::setScalingGroupId(const std::string& scalingGroupId)
 	setParameter("ScalingGroupId", scalingGroupId);
 }
 
-long EnterStandbyRequest::getOwnerId()const
+std::string EnterStandbyRequest::getAccessKeyId()const
 {
-	return ownerId_;
+	return accessKeyId_;
 }
 
-void EnterStandbyRequest::setOwnerId(long ownerId)
+void EnterStandbyRequest::setAccessKeyId(const std::string& accessKeyId)
 {
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
 }
 
-std::string EnterStandbyRequest::getAccessKeyId()const
+std::string EnterStandbyRequest::getResourceOwnerAccount()const
 {
-	return accessKeyId_;
+	return resourceOwnerAccount_;
 }
 
-void EnterStandbyRequest::setAccessKeyId(const std::string& accessKeyId)
+void EnterStandbyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
 {
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long EnterStandbyRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void EnterStandbyRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
 }
 
 std::vector<std::string> EnterStandbyRequest::getInstanceId()const

+ 26 - 15
ess/src/model/EnterStandbyResult.cc

@@ -27,15 +27,15 @@ ExitStandbyRequest::ExitStandbyRequest() :
 ExitStandbyRequest::~ExitStandbyRequest()
 {}
 
-std::string ExitStandbyRequest::getResourceOwnerAccount()const
+std::string ExitStandbyRequest::getClientToken()const
 {
-	return resourceOwnerAccount_;
+	return clientToken_;
 }
 
-void ExitStandbyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+void ExitStandbyRequest::setClientToken(const std::string& clientToken)
 {
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
 }
 
 std::string ExitStandbyRequest::getScalingGroupId()const
@@ -49,26 +49,37 @@ void ExitStandbyRequest::setScalingGroupId(const std::string& scalingGroupId)
 	setParameter("ScalingGroupId", scalingGroupId);
 }
 
-long ExitStandbyRequest::getOwnerId()const
+std::string ExitStandbyRequest::getAccessKeyId()const
 {
-	return ownerId_;
+	return accessKeyId_;
 }
 
-void ExitStandbyRequest::setOwnerId(long ownerId)
+void ExitStandbyRequest::setAccessKeyId(const std::string& accessKeyId)
 {
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
 }
 
-std::string ExitStandbyRequest::getAccessKeyId()const
+std::string ExitStandbyRequest::getResourceOwnerAccount()const
 {
-	return accessKeyId_;
+	return resourceOwnerAccount_;
 }
 
-void ExitStandbyRequest::setAccessKeyId(const std::string& accessKeyId)
+void ExitStandbyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
 {
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+long ExitStandbyRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void ExitStandbyRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
 }
 
 std::vector<std::string> ExitStandbyRequest::getInstanceId()const

+ 11 - 0
ess/src/model/ExitStandbyResult.cc

@@ -84,6 +84,17 @@ void ModifyAlarmRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string ModifyAlarmRequest::getEffective()const
+{
+	return effective_;
+}
+
+void ModifyAlarmRequest::setEffective(const std::string& effective)
+{
+	effective_ = effective;
+	setParameter("Effective", effective);
+}
+
 std::string ModifyAlarmRequest::getRegionId()const
 {
 	return regionId_;

+ 0 - 104
ess/src/model/ModifyAlarmResult.cc

@@ -1,104 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/ModifyAlertConfigRequest.h>
-
-using AlibabaCloud::Ess::Model::ModifyAlertConfigRequest;
-
-ModifyAlertConfigRequest::ModifyAlertConfigRequest() :
-	RpcServiceRequest("ess", "2014-08-28", "ModifyAlertConfig")
-{}
-
-ModifyAlertConfigRequest::~ModifyAlertConfigRequest()
-{}
-
-int ModifyAlertConfigRequest::getRejectConfig()const
-{
-	return rejectConfig_;
-}
-
-void ModifyAlertConfigRequest::setRejectConfig(int rejectConfig)
-{
-	rejectConfig_ = rejectConfig;
-	setCoreParameter("RejectConfig", std::to_string(rejectConfig));
-}
-
-std::string ModifyAlertConfigRequest::getScalingGroupId()const
-{
-	return scalingGroupId_;
-}
-
-void ModifyAlertConfigRequest::setScalingGroupId(const std::string& scalingGroupId)
-{
-	scalingGroupId_ = scalingGroupId;
-	setCoreParameter("ScalingGroupId", scalingGroupId);
-}
-
-int ModifyAlertConfigRequest::getFailConfig()const
-{
-	return failConfig_;
-}
-
-void ModifyAlertConfigRequest::setFailConfig(int failConfig)
-{
-	failConfig_ = failConfig;
-	setCoreParameter("FailConfig", std::to_string(failConfig));
-}
-
-std::string ModifyAlertConfigRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void ModifyAlertConfigRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
-}
-
-std::string ModifyAlertConfigRequest::getResourceOwnerAccount()const
-{
-	return resourceOwnerAccount_;
-}
-
-void ModifyAlertConfigRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
-{
-	resourceOwnerAccount_ = resourceOwnerAccount;
-	setCoreParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-long ModifyAlertConfigRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void ModifyAlertConfigRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setCoreParameter("OwnerId", std::to_string(ownerId));
-}
-
-int ModifyAlertConfigRequest::getSuccessConfig()const
-{
-	return successConfig_;
-}
-
-void ModifyAlertConfigRequest::setSuccessConfig(int successConfig)
-{
-	successConfig_ = successConfig;
-	setCoreParameter("SuccessConfig", std::to_string(successConfig));
-}
-

+ 0 - 44
ess/src/model/ModifyAlertConfigResult.cc

@@ -1,44 +0,0 @@
-/*
- * Copyright 2009-2017 Alibaba Cloud All rights reserved.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <alibabacloud/ess/model/ModifyAlertConfigResult.h>
-#include <json/json.h>
-
-using namespace AlibabaCloud::Ess;
-using namespace AlibabaCloud::Ess::Model;
-
-ModifyAlertConfigResult::ModifyAlertConfigResult() :
-	ServiceResult()
-{}
-
-ModifyAlertConfigResult::ModifyAlertConfigResult(const std::string &payload) :
-	ServiceResult()
-{
-	parse(payload);
-}
-
-ModifyAlertConfigResult::~ModifyAlertConfigResult()
-{}
-
-void ModifyAlertConfigResult::parse(const std::string &payload)
-{
-	Json::Reader reader;
-	Json::Value value;
-	reader.parse(payload, value);
-	setRequestId(value["RequestId"].asString());
-
-}
-

+ 99 - 0
ess/src/model/ModifyLifecycleHookRequest.cc

@@ -76,6 +76,17 @@ void ModifyScalingConfigurationRequest::setResourceGroupId(const std::string& re
 	setParameter("ResourceGroupId", resourceGroupId);
 }
 
+std::string ModifyScalingConfigurationRequest::getPrivatePoolOptionsMatchCriteria()const
+{
+	return privatePoolOptionsMatchCriteria_;
+}
+
+void ModifyScalingConfigurationRequest::setPrivatePoolOptionsMatchCriteria(const std::string& privatePoolOptionsMatchCriteria)
+{
+	privatePoolOptionsMatchCriteria_ = privatePoolOptionsMatchCriteria;
+	setParameter("PrivatePoolOptionsMatchCriteria", privatePoolOptionsMatchCriteria);
+}
+
 std::string ModifyScalingConfigurationRequest::getHostName()const
 {
 	return hostName_;
@@ -109,6 +120,17 @@ void ModifyScalingConfigurationRequest::setSystemDiskAutoSnapshotPolicyId(const
 	setParameter("SystemDiskAutoSnapshotPolicyId", systemDiskAutoSnapshotPolicyId);
 }
 
+std::string ModifyScalingConfigurationRequest::getPrivatePoolOptionsId()const
+{
+	return privatePoolOptionsId_;
+}
+
+void ModifyScalingConfigurationRequest::setPrivatePoolOptionsId(const std::string& privatePoolOptionsId)
+{
+	privatePoolOptionsId_ = privatePoolOptionsId;
+	setParameter("PrivatePoolOptionsId", privatePoolOptionsId);
+}
+
 int ModifyScalingConfigurationRequest::getIpv6AddressCount()const
 {
 	return ipv6AddressCount_;
@@ -208,6 +230,28 @@ void ModifyScalingConfigurationRequest::setInternetChargeType(const std::string&
 	setParameter("InternetChargeType", internetChargeType);
 }
 
+std::string ModifyScalingConfigurationRequest::getZoneId()const
+{
+	return zoneId_;
+}
+
+void ModifyScalingConfigurationRequest::setZoneId(const std::string& zoneId)
+{
+	zoneId_ = zoneId;
+	setParameter("ZoneId", zoneId);
+}
+
+std::string ModifyScalingConfigurationRequest::getAffinity()const
+{
+	return affinity_;
+}
+
+void ModifyScalingConfigurationRequest::setAffinity(const std::string& affinity)
+{
+	affinity_ = affinity;
+	setParameter("Affinity", affinity);
+}
+
 std::string ModifyScalingConfigurationRequest::getImageId()const
 {
 	return imageId_;
@@ -342,6 +386,17 @@ void ModifyScalingConfigurationRequest::setOverride(bool override)
 	setParameter("Override", override ? "true" : "false");
 }
 
+std::map<std::string, std::string> ModifyScalingConfigurationRequest::getSchedulerOptions()const
+{
+	return schedulerOptions_;
+}
+
+void ModifyScalingConfigurationRequest::setSchedulerOptions(const std::map<std::string, std::string>& schedulerOptions)
+{
+	schedulerOptions_ = schedulerOptions;
+	setJsonParameters("SchedulerOptions", schedulerOptions);
+}
+
 std::string ModifyScalingConfigurationRequest::getDeploymentSetId()const
 {
 	return deploymentSetId_;
@@ -375,6 +430,17 @@ void ModifyScalingConfigurationRequest::setOwnerAccount(const std::string& owner
 	setParameter("OwnerAccount", ownerAccount);
 }
 
+std::string ModifyScalingConfigurationRequest::getTenancy()const
+{
+	return tenancy_;
+}
+
+void ModifyScalingConfigurationRequest::setTenancy(const std::string& tenancy)
+{
+	tenancy_ = tenancy;
+	setParameter("Tenancy", tenancy);
+}
+
 std::string ModifyScalingConfigurationRequest::getSystemDiskDiskName()const
 {
 	return systemDiskDiskName_;
@@ -397,6 +463,28 @@ void ModifyScalingConfigurationRequest::setRamRoleName(const std::string& ramRol
 	setParameter("RamRoleName", ramRoleName);
 }
 
+std::string ModifyScalingConfigurationRequest::getDedicatedHostId()const
+{
+	return dedicatedHostId_;
+}
+
+void ModifyScalingConfigurationRequest::setDedicatedHostId(const std::string& dedicatedHostId)
+{
+	dedicatedHostId_ = dedicatedHostId;
+	setParameter("DedicatedHostId", dedicatedHostId);
+}
+
+std::string ModifyScalingConfigurationRequest::getCreditSpecification()const
+{
+	return creditSpecification_;
+}
+
+void ModifyScalingConfigurationRequest::setCreditSpecification(const std::string& creditSpecification)
+{
+	creditSpecification_ = creditSpecification;
+	setParameter("CreditSpecification", creditSpecification);
+}
+
 std::vector<std::string> ModifyScalingConfigurationRequest::getSecurityGroupIds()const
 {
 	return securityGroupIds_;
@@ -456,6 +544,17 @@ void ModifyScalingConfigurationRequest::setSystemDiskSize(int systemDiskSize)
 	setParameter("SystemDiskSize", std::to_string(systemDiskSize));
 }
 
+std::string ModifyScalingConfigurationRequest::getImageFamily()const
+{
+	return imageFamily_;
+}
+
+void ModifyScalingConfigurationRequest::setImageFamily(const std::string& imageFamily)
+{
+	imageFamily_ = imageFamily;
+	setParameter("ImageFamily", imageFamily);
+}
+
 std::string ModifyScalingConfigurationRequest::getSystemDiskDescription()const
 {
 	return systemDiskDescription_;

+ 22 - 0
ess/src/model/ModifyScalingConfigurationResult.cc

@@ -117,6 +117,17 @@ void ModifyScalingGroupRequest::setSpotInstanceRemedy(bool spotInstanceRemedy)
 	setParameter("SpotInstanceRemedy", spotInstanceRemedy ? "true" : "false");
 }
 
+bool ModifyScalingGroupRequest::getScaleOutAmountCheck()const
+{
+	return scaleOutAmountCheck_;
+}
+
+void ModifyScalingGroupRequest::setScaleOutAmountCheck(bool scaleOutAmountCheck)
+{
+	scaleOutAmountCheck_ = scaleOutAmountCheck;
+	setParameter("ScaleOutAmountCheck", scaleOutAmountCheck ? "true" : "false");
+}
+
 int ModifyScalingGroupRequest::getDefaultCooldown()const
 {
 	return defaultCooldown_;
@@ -216,6 +227,17 @@ void ModifyScalingGroupRequest::setOwnerAccount(const std::string& ownerAccount)
 	setParameter("OwnerAccount", ownerAccount);
 }
 
+bool ModifyScalingGroupRequest::getCompensateWithOnDemand()const
+{
+	return compensateWithOnDemand_;
+}
+
+void ModifyScalingGroupRequest::setCompensateWithOnDemand(bool compensateWithOnDemand)
+{
+	compensateWithOnDemand_ = compensateWithOnDemand;
+	setParameter("CompensateWithOnDemand", compensateWithOnDemand ? "true" : "false");
+}
+
 int ModifyScalingGroupRequest::getSpotInstancePools()const
 {
 	return spotInstancePools_;

+ 22 - 0
ess/src/model/ModifyScalingGroupResult.cc

@@ -132,6 +132,17 @@ void ModifyScalingRuleRequest::setPredictiveValueBehavior(const std::string& pre
 	setParameter("PredictiveValueBehavior", predictiveValueBehavior);
 }
 
+int ModifyScalingRuleRequest::getScaleInEvaluationCount()const
+{
+	return scaleInEvaluationCount_;
+}
+
+void ModifyScalingRuleRequest::setScaleInEvaluationCount(int scaleInEvaluationCount)
+{
+	scaleInEvaluationCount_ = scaleInEvaluationCount;
+	setParameter("ScaleInEvaluationCount", std::to_string(scaleInEvaluationCount));
+}
+
 std::string ModifyScalingRuleRequest::getMetricName()const
 {
 	return metricName_;
@@ -242,6 +253,17 @@ void ModifyScalingRuleRequest::setPredictiveValueBuffer(int predictiveValueBuffe
 	setParameter("PredictiveValueBuffer", std::to_string(predictiveValueBuffer));
 }
 
+int ModifyScalingRuleRequest::getScaleOutEvaluationCount()const
+{
+	return scaleOutEvaluationCount_;
+}
+
+void ModifyScalingRuleRequest::setScaleOutEvaluationCount(int scaleOutEvaluationCount)
+{
+	scaleOutEvaluationCount_ = scaleOutEvaluationCount;
+	setParameter("ScaleOutEvaluationCount", std::to_string(scaleOutEvaluationCount));
+}
+
 int ModifyScalingRuleRequest::getMinAdjustmentMagnitude()const
 {
 	return minAdjustmentMagnitude_;

+ 33 - 22
ess/src/model/ModifyScalingRuleResult.cc

@@ -27,6 +27,39 @@ ResumeProcessesRequest::ResumeProcessesRequest() :
 ResumeProcessesRequest::~ResumeProcessesRequest()
 {}
 
+std::string ResumeProcessesRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void ResumeProcessesRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
+std::string ResumeProcessesRequest::getScalingGroupId()const
+{
+	return scalingGroupId_;
+}
+
+void ResumeProcessesRequest::setScalingGroupId(const std::string& scalingGroupId)
+{
+	scalingGroupId_ = scalingGroupId;
+	setParameter("ScalingGroupId", scalingGroupId);
+}
+
+std::string ResumeProcessesRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void ResumeProcessesRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
 std::vector<std::string> ResumeProcessesRequest::getProcess()const
 {
 	return process_;
@@ -51,17 +84,6 @@ void ResumeProcessesRequest::setResourceOwnerAccount(const std::string& resource
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
-std::string ResumeProcessesRequest::getScalingGroupId()const
-{
-	return scalingGroupId_;
-}
-
-void ResumeProcessesRequest::setScalingGroupId(const std::string& scalingGroupId)
-{
-	scalingGroupId_ = scalingGroupId;
-	setParameter("ScalingGroupId", scalingGroupId);
-}
-
 long ResumeProcessesRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -73,14 +95,3 @@ void ResumeProcessesRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string ResumeProcessesRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void ResumeProcessesRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

+ 33 - 22
ess/src/model/SetInstancesProtectionRequest.cc

@@ -27,6 +27,39 @@ SuspendProcessesRequest::SuspendProcessesRequest() :
 SuspendProcessesRequest::~SuspendProcessesRequest()
 {}
 
+std::string SuspendProcessesRequest::getClientToken()const
+{
+	return clientToken_;
+}
+
+void SuspendProcessesRequest::setClientToken(const std::string& clientToken)
+{
+	clientToken_ = clientToken;
+	setParameter("ClientToken", clientToken);
+}
+
+std::string SuspendProcessesRequest::getScalingGroupId()const
+{
+	return scalingGroupId_;
+}
+
+void SuspendProcessesRequest::setScalingGroupId(const std::string& scalingGroupId)
+{
+	scalingGroupId_ = scalingGroupId;
+	setParameter("ScalingGroupId", scalingGroupId);
+}
+
+std::string SuspendProcessesRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void SuspendProcessesRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
 std::vector<std::string> SuspendProcessesRequest::getProcess()const
 {
 	return process_;
@@ -51,17 +84,6 @@ void SuspendProcessesRequest::setResourceOwnerAccount(const std::string& resourc
 	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
 }
 
-std::string SuspendProcessesRequest::getScalingGroupId()const
-{
-	return scalingGroupId_;
-}
-
-void SuspendProcessesRequest::setScalingGroupId(const std::string& scalingGroupId)
-{
-	scalingGroupId_ = scalingGroupId;
-	setParameter("ScalingGroupId", scalingGroupId);
-}
-
 long SuspendProcessesRequest::getOwnerId()const
 {
 	return ownerId_;
@@ -73,14 +95,3 @@ void SuspendProcessesRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
-std::string SuspendProcessesRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void SuspendProcessesRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("AccessKeyId", accessKeyId);
-}
-

+ 11 - 0
ess/src/model/VerifyAuthenticationRequest.cc

@@ -71,6 +71,17 @@ void VerifyAuthenticationRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+bool VerifyAuthenticationRequest::getOnlyCheck()const
+{
+	return onlyCheck_;
+}
+
+void VerifyAuthenticationRequest::setOnlyCheck(bool onlyCheck)
+{
+	onlyCheck_ = onlyCheck;
+	setParameter("OnlyCheck", onlyCheck ? "true" : "false");
+}
+
 long VerifyAuthenticationRequest::getUid()const
 {
 	return uid_;

+ 0 - 0
ess/src/model/VerifyAuthenticationResult.cc