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

ESS SDK Auto Released By deyan.jdy,Version:1.34.2

Signed-off-by: yixiong.jxy <yixiong.jxy@alibaba-inc.com>
yixiong.jxy 7 лет назад
Родитель
Сommit
aa71e41fab
29 измененных файлов с 180 добавлено и 973 удалено
  1. 3 0
      CHANGELOG
  2. 1 1
      VERSION
  3. 0 12
      ess/.idea/eclipseCodeFormatter.xml
  4. 0 9
      ess/.idea/ess.iml
  5. 0 36
      ess/.idea/inspectionProfiles/Project_Default.xml
  6. 0 4
      ess/.idea/misc.xml
  7. 0 8
      ess/.idea/modules.xml
  8. 0 562
      ess/.idea/workspace.xml
  9. 1 5
      ess/CMakeLists.txt
  10. 0 8
      ess/include/alibabacloud/ess/EssClient.h
  11. 12 0
      ess/include/alibabacloud/ess/model/CreateScalingConfigurationRequest.h
  12. 3 0
      ess/include/alibabacloud/ess/model/CreateScalingGroupRequest.h
  13. 0 54
      ess/include/alibabacloud/ess/model/DescribeAccountAttributesRequest.h
  14. 0 67
      ess/include/alibabacloud/ess/model/DescribeAccountAttributesResult.h
  15. 2 0
      ess/include/alibabacloud/ess/model/DescribeScalingConfigurationsResult.h
  16. 2 0
      ess/include/alibabacloud/ess/model/DescribeScalingGroupsResult.h
  17. 2 0
      ess/include/alibabacloud/ess/model/DescribeScalingInstancesResult.h
  18. 15 0
      ess/include/alibabacloud/ess/model/ModifyScalingConfigurationRequest.h
  19. 3 0
      ess/include/alibabacloud/ess/model/RemoveInstancesRequest.h
  20. 3 39
      ess/src/EssClient.cc
  21. 44 0
      ess/src/model/CreateScalingConfigurationRequest.cc
  22. 11 0
      ess/src/model/CreateScalingGroupRequest.cc
  23. 0 60
      ess/src/model/DescribeAccountAttributesRequest.cc
  24. 0 108
      ess/src/model/DescribeAccountAttributesResult.cc
  25. 4 0
      ess/src/model/DescribeScalingConfigurationsResult.cc
  26. 4 0
      ess/src/model/DescribeScalingGroupsResult.cc
  27. 4 0
      ess/src/model/DescribeScalingInstancesResult.cc
  28. 55 0
      ess/src/model/ModifyScalingConfigurationRequest.cc
  29. 11 0
      ess/src/model/RemoveInstancesRequest.cc

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2018-12-03 Version: 1.34.2
+1,  Add a parameter to RemoveInstances.
+
 2018-11-30 Version: 1.34.1
 2018-11-30 Version: 1.34.1
 1, Add new apis called AddVodTemplate, UpdateVodTemplate, DeleteVodTemplate, ListVodTemplate, GetVodTemplate and SetDefaultVodTemplate which support vodtemplate feature.
 1, Add new apis called AddVodTemplate, UpdateVodTemplate, DeleteVodTemplate, ListVodTemplate, GetVodTemplate and SetDefaultVodTemplate which support vodtemplate feature.
 2, Add a new api called CreateUploadAttachedMedia to get upload auth for attached media
 2, Add a new api called CreateUploadAttachedMedia to get upload auth for attached media

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.34.1
+1.34.2

+ 0 - 12
ess/.idea/eclipseCodeFormatter.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EclipseCodeFormatterProjectSettings">
-    <option name="projectSpecificProfile">
-      <ProjectSpecificProfile>
-        <option name="formatter" value="ECLIPSE" />
-        <option name="pathToConfigFileJava" value="$USER_HOME$/alibaba/configs/eclipse_code_formatter.xml" />
-        <option name="selectedJavaProfile" value="Alibaba Conventions" />
-      </ProjectSpecificProfile>
-    </option>
-  </component>
-</project>

+ 0 - 9
ess/.idea/ess.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

+ 0 - 36
ess/.idea/inspectionProfiles/Project_Default.xml

@@ -1,36 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="TOP_LEVEL_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="INNER_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="METHOD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
-        </value>
-      </option>
-      <option name="FIELD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="IGNORE_DEPRECATED" value="false" />
-      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
-      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
-      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
-      <option name="myAdditionalJavadocTags" value="date" />
-    </inspection_tool>
-  </profile>
-</component>

+ 0 - 4
ess/.idea/misc.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>

+ 0 - 8
ess/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ess.iml" filepath="$PROJECT_DIR$/.idea/ess.iml" />
-    </modules>
-  </component>
-</project>

+ 0 - 562
ess/.idea/workspace.xml

@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="449ead1a-8f2f-4c60-bf9e-e09188a6e69b" name="Default" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="CreateNotificationConfigurationRequest.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateNotificationConfigurationRequest.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateNotificationConfigurationResult.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateNotificationConfigurationResult.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateScalingConfigurationRequest.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateScalingConfigurationRequest.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="222">
-              <caret line="54" column="102" lean-forward="false" selection-start-line="54" selection-start-column="89" selection-end-line="54" selection-end-column="102" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DescribeAlarmsResult.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/DescribeAlarmsResult.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="82" column="28" lean-forward="false" selection-start-line="82" selection-start-column="16" selection-end-line="82" selection-end-column="28" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="DescribeAlarmsResult.h" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/include/alibabacloud/ess/model/DescribeAlarmsResult.h">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="218">
-              <caret line="50" column="25" lean-forward="false" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateScalingConfigurationResult.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateScalingConfigurationResult.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="4" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateScalingGroupRequest.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateScalingGroupRequest.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="38" column="45" lean-forward="false" selection-start-line="38" selection-start-column="44" selection-end-line="38" selection-end-column="45" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateLifecycleHookResult.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateLifecycleHookResult.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateLifecycleHookRequest.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateLifecycleHookRequest.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CreateAlarmRequest.cc" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/model/CreateAlarmRequest.cc">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>ins</find>
-      <find>instancetypes</find>
-      <find>alarmActions</find>
-    </findStrings>
-  </component>
-  <component name="GradleLocalSettings">
-    <option name="externalProjectsViewState">
-      <projects_view />
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="MavenImportPreferences">
-    <option name="generalSettings">
-      <MavenGeneralSettings>
-        <option name="mavenHome" value="$USER_HOME$/alibaba/softwares/maven/apache-maven-3.2.5" />
-      </MavenGeneralSettings>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Android &gt; Lint &gt; Correctness</id>
-          </State>
-          <State>
-            <id>Gradle</id>
-          </State>
-          <State>
-            <id>Kotlin</id>
-          </State>
-          <State>
-            <id>Maven</id>
-          </State>
-          <State>
-            <id>OSGi</id>
-          </State>
-          <State>
-            <id>Probable bugsGradle</id>
-          </State>
-        </expanded-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource ProjectPane="true" />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-              <item name="alibabacloud" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-              <item name="alibabacloud" type="462c0819:PsiDirectoryNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="include" type="462c0819:PsiDirectoryNode" />
-              <item name="alibabacloud" type="462c0819:PsiDirectoryNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="ess" type="b2602c69:ProjectViewProjectNode" />
-              <item name="ess" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
-      <pane id="Scratches" />
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="com.intellij.jarRepository.settings.RemoteRepositoriesConfigurable" />
-    <property name="project.structure.last.edited" value="SDKs" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <module />
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-    </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
-    <configuration default="true" type="TestNG" factoryName="TestNG">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="SUITE_NAME" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="GROUP_NAME" />
-      <option name="TEST_OBJECT" value="CLASS" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <option name="OUTPUT_DIRECTORY" />
-      <option name="ANNOTATION_TYPE" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <option name="USE_DEFAULT_REPORTERS" value="false" />
-      <option name="PROPERTIES_FILE" />
-      <envs />
-      <properties />
-      <listeners />
-    </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file id="idea.log" enabled="true" />
-    </configuration>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="449ead1a-8f2f-4c60-bf9e-e09188a6e69b" name="Default" comment="" />
-      <created>1536220177259</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1536220177259</updated>
-      <workItem from="1536220178873" duration="126000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="126000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="828" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-    <watches-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/model/CreateAlarmResult.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateAlarmRequest.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateLifecycleHookRequest.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateLifecycleHookResult.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateNotificationConfigurationRequest.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateNotificationConfigurationResult.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateScalingGroupRequest.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="38" column="45" lean-forward="false" selection-start-line="38" selection-start-column="44" selection-end-line="38" selection-end-column="45" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateScalingConfigurationResult.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="4" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/CreateScalingConfigurationRequest.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="222">
-          <caret line="54" column="102" lean-forward="false" selection-start-line="54" selection-start-column="89" selection-end-line="54" selection-end-column="102" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/model/DescribeAlarmsResult.cc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="82" column="28" lean-forward="false" selection-start-line="82" selection-start-column="16" selection-end-line="82" selection-end-column="28" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/include/alibabacloud/ess/model/DescribeAlarmsResult.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="218">
-          <caret line="50" column="25" lean-forward="false" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-  </component>
-  <component name="masterDetails">
-    <states>
-      <state key="GlobalLibrariesConfigurable.UI">
-        <settings>
-          <last-edited>groovy-2.4.13</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="JdkListConfigurable.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ProjectLibrariesConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-      <state key="ScopeChooserConfigurable.UI">
-        <settings>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
-</project>

+ 1 - 5
ess/CMakeLists.txt

@@ -59,8 +59,6 @@ set(ess_public_header_model
 	include/alibabacloud/ess/model/DescribeLifecycleHooksResult.h
 	include/alibabacloud/ess/model/DescribeLifecycleHooksResult.h
 	include/alibabacloud/ess/model/ModifyAlarmRequest.h
 	include/alibabacloud/ess/model/ModifyAlarmRequest.h
 	include/alibabacloud/ess/model/ModifyAlarmResult.h
 	include/alibabacloud/ess/model/ModifyAlarmResult.h
-	include/alibabacloud/ess/model/DescribeAccountAttributesRequest.h
-	include/alibabacloud/ess/model/DescribeAccountAttributesResult.h
 	include/alibabacloud/ess/model/DeleteAlarmRequest.h
 	include/alibabacloud/ess/model/DeleteAlarmRequest.h
 	include/alibabacloud/ess/model/DeleteAlarmResult.h
 	include/alibabacloud/ess/model/DeleteAlarmResult.h
 	include/alibabacloud/ess/model/DescribeScalingActivityDetailRequest.h
 	include/alibabacloud/ess/model/DescribeScalingActivityDetailRequest.h
@@ -180,8 +178,6 @@ set(ess_src
 	src/model/DescribeLifecycleHooksResult.cc
 	src/model/DescribeLifecycleHooksResult.cc
 	src/model/ModifyAlarmRequest.cc
 	src/model/ModifyAlarmRequest.cc
 	src/model/ModifyAlarmResult.cc
 	src/model/ModifyAlarmResult.cc
-	src/model/DescribeAccountAttributesRequest.cc
-	src/model/DescribeAccountAttributesResult.cc
 	src/model/DeleteAlarmRequest.cc
 	src/model/DeleteAlarmRequest.cc
 	src/model/DeleteAlarmResult.cc
 	src/model/DeleteAlarmResult.cc
 	src/model/DescribeScalingActivityDetailRequest.cc
 	src/model/DescribeScalingActivityDetailRequest.cc
@@ -315,4 +311,4 @@ install(TARGETS ess
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-	)
+	)

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

@@ -60,8 +60,6 @@
 #include "model/DescribeLifecycleHooksResult.h"
 #include "model/DescribeLifecycleHooksResult.h"
 #include "model/ModifyAlarmRequest.h"
 #include "model/ModifyAlarmRequest.h"
 #include "model/ModifyAlarmResult.h"
 #include "model/ModifyAlarmResult.h"
-#include "model/DescribeAccountAttributesRequest.h"
-#include "model/DescribeAccountAttributesResult.h"
 #include "model/DeleteAlarmRequest.h"
 #include "model/DeleteAlarmRequest.h"
 #include "model/DeleteAlarmResult.h"
 #include "model/DeleteAlarmResult.h"
 #include "model/DescribeScalingActivityDetailRequest.h"
 #include "model/DescribeScalingActivityDetailRequest.h"
@@ -206,9 +204,6 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ModifyAlarmResult> ModifyAlarmOutcome;
 			typedef Outcome<Error, Model::ModifyAlarmResult> ModifyAlarmOutcome;
 			typedef std::future<ModifyAlarmOutcome> ModifyAlarmOutcomeCallable;
 			typedef std::future<ModifyAlarmOutcome> ModifyAlarmOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::ModifyAlarmRequest&, const ModifyAlarmOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAlarmAsyncHandler;
 			typedef std::function<void(const EssClient*, const Model::ModifyAlarmRequest&, const ModifyAlarmOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ModifyAlarmAsyncHandler;
-			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::DeleteAlarmResult> DeleteAlarmOutcome;
 			typedef Outcome<Error, Model::DeleteAlarmResult> DeleteAlarmOutcome;
 			typedef std::future<DeleteAlarmOutcome> DeleteAlarmOutcomeCallable;
 			typedef std::future<DeleteAlarmOutcome> DeleteAlarmOutcomeCallable;
 			typedef std::function<void(const EssClient*, const Model::DeleteAlarmRequest&, const DeleteAlarmOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteAlarmAsyncHandler;
 			typedef std::function<void(const EssClient*, const Model::DeleteAlarmRequest&, const DeleteAlarmOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DeleteAlarmAsyncHandler;
@@ -388,9 +383,6 @@ namespace AlibabaCloud
 			ModifyAlarmOutcome modifyAlarm(const Model::ModifyAlarmRequest &request)const;
 			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;
 			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;
 			ModifyAlarmOutcomeCallable modifyAlarmCallable(const Model::ModifyAlarmRequest& 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;
 			DeleteAlarmOutcome deleteAlarm(const Model::DeleteAlarmRequest &request)const;
 			DeleteAlarmOutcome deleteAlarm(const Model::DeleteAlarmRequest &request)const;
 			void deleteAlarmAsync(const Model::DeleteAlarmRequest& request, const DeleteAlarmAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			void deleteAlarmAsync(const Model::DeleteAlarmRequest& request, const DeleteAlarmAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DeleteAlarmOutcomeCallable deleteAlarmCallable(const Model::DeleteAlarmRequest& request) const;
 			DeleteAlarmOutcomeCallable deleteAlarmCallable(const Model::DeleteAlarmRequest& request) const;

+ 12 - 0
ess/include/alibabacloud/ess/model/CreateScalingConfigurationRequest.h

@@ -50,6 +50,8 @@ namespace AlibabaCloud
 
 
 				std::string getImageId()const;
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
 				void setImageId(const std::string& imageId);
+				int getMemory()const;
+				void setMemory(int memory);
 				std::string getScalingGroupId()const;
 				std::string getScalingGroupId()const;
 				void setScalingGroupId(const std::string& scalingGroupId);
 				void setScalingGroupId(const std::string& scalingGroupId);
 				std::vector<std::string> getInstanceTypes()const;
 				std::vector<std::string> getInstanceTypes()const;
@@ -74,16 +76,22 @@ namespace AlibabaCloud
 				void setUserData(const std::string& userData);
 				void setUserData(const std::string& userData);
 				std::string getHostName()const;
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				void setHostName(const std::string& hostName);
+				std::string getPassword()const;
+				void setPassword(const std::string& password);
 				bool getPasswordInherit()const;
 				bool getPasswordInherit()const;
 				void setPasswordInherit(bool passwordInherit);
 				void setPasswordInherit(bool passwordInherit);
 				std::string getImageName()const;
 				std::string getImageName()const;
 				void setImageName(const std::string& imageName);
 				void setImageName(const std::string& imageName);
 				std::string getInstanceType()const;
 				std::string getInstanceType()const;
 				void setInstanceType(const std::string& instanceType);
 				void setInstanceType(const std::string& instanceType);
+				std::string getDeploymentSetId()const;
+				void setDeploymentSetId(const std::string& deploymentSetId);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				void setOwnerAccount(const std::string& ownerAccount);
+				int getCpu()const;
+				void setCpu(int cpu);
 				std::string getRamRoleName()const;
 				std::string getRamRoleName()const;
 				void setRamRoleName(const std::string& ramRoleName);
 				void setRamRoleName(const std::string& ramRoleName);
 				long getOwnerId()const;
 				long getOwnerId()const;
@@ -109,6 +117,7 @@ namespace AlibabaCloud
 
 
             private:
             private:
 				std::string imageId_;
 				std::string imageId_;
+				int memory_;
 				std::string scalingGroupId_;
 				std::string scalingGroupId_;
 				std::vector<std::string> instanceTypes_;
 				std::vector<std::string> instanceTypes_;
 				std::string ioOptimized_;
 				std::string ioOptimized_;
@@ -121,11 +130,14 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string accessKeyId_;
 				std::string userData_;
 				std::string userData_;
 				std::string hostName_;
 				std::string hostName_;
+				std::string password_;
 				bool passwordInherit_;
 				bool passwordInherit_;
 				std::string imageName_;
 				std::string imageName_;
 				std::string instanceType_;
 				std::string instanceType_;
+				std::string deploymentSetId_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
+				int cpu_;
 				std::string ramRoleName_;
 				std::string ramRoleName_;
 				long ownerId_;
 				long ownerId_;
 				std::vector<DataDisk> dataDisk_;
 				std::vector<DataDisk> dataDisk_;

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

@@ -68,6 +68,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				void setOwnerId(long ownerId);
 				std::string getLaunchTemplateVersion()const;
 				std::string getLaunchTemplateVersion()const;
 				void setLaunchTemplateVersion(const std::string& launchTemplateVersion);
 				void setLaunchTemplateVersion(const std::string& launchTemplateVersion);
+				std::string getScalingPolicy()const;
+				void setScalingPolicy(const std::string& scalingPolicy);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
 				std::string getVSwitchId()const;
 				std::string getVSwitchId()const;
@@ -98,6 +100,7 @@ namespace AlibabaCloud
 				int minSize_;
 				int minSize_;
 				long ownerId_;
 				long ownerId_;
 				std::string launchTemplateVersion_;
 				std::string launchTemplateVersion_;
+				std::string scalingPolicy_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
 				std::string vSwitchId_;
 				std::string vSwitchId_;
 				std::string regionId_;
 				std::string regionId_;

+ 0 - 54
ess/include/alibabacloud/ess/model/DescribeAccountAttributesRequest.h

@@ -1,54 +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_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_
-#define ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_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 DescribeAccountAttributesRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAccountAttributesRequest();
-				~DescribeAccountAttributesRequest();
-
-				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);
-
-            private:
-				std::string resourceOwnerAccount_;
-				long ownerId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_ESS_MODEL_DESCRIBEACCOUNTATTRIBUTESREQUEST_H_

+ 0 - 67
ess/include/alibabacloud/ess/model/DescribeAccountAttributesResult.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_

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

@@ -56,6 +56,8 @@ namespace AlibabaCloud
 					std::vector<ScalingConfiguration::DataDisk> dataDisks;
 					std::vector<ScalingConfiguration::DataDisk> dataDisks;
 					int systemDiskSize;
 					int systemDiskSize;
 					std::string userData;
 					std::string userData;
+					int memory;
+					int cpu;
 					std::string lifecycleState;
 					std::string lifecycleState;
 					std::string ramRoleName;
 					std::string ramRoleName;
 					std::string imageId;
 					std::string imageId;

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

@@ -43,6 +43,7 @@ namespace AlibabaCloud
 					int removingWaitCapacity;
 					int removingWaitCapacity;
 					int protectedCapacity;
 					int protectedCapacity;
 					int standbyCapacity;
 					int standbyCapacity;
+					std::string scalingPolicy;
 					int removingCapacity;
 					int removingCapacity;
 					std::vector<std::string> vSwitchIds;
 					std::vector<std::string> vSwitchIds;
 					int pendingCapacity;
 					int pendingCapacity;
@@ -59,6 +60,7 @@ namespace AlibabaCloud
 					std::string launchTemplateVersion;
 					std::string launchTemplateVersion;
 					std::string creationTime;
 					std::string creationTime;
 					std::string multiAZPolicy;
 					std::string multiAZPolicy;
+					int stoppedCapacity;
 					std::string regionId;
 					std::string regionId;
 					std::vector<std::string> dBInstanceIds;
 					std::vector<std::string> dBInstanceIds;
 					std::string healthCheckType;
 					std::string healthCheckType;

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

@@ -39,7 +39,9 @@ namespace AlibabaCloud
 					std::string scalingGroupId;
 					std::string scalingGroupId;
 					std::string healthStatus;
 					std::string healthStatus;
 					std::string creationTime;
 					std::string creationTime;
+					std::string launchTemplateVersion;
 					std::string lifecycleState;
 					std::string lifecycleState;
+					std::string launchTemplateId;
 					std::string scalingConfigurationId;
 					std::string scalingConfigurationId;
 					std::string creationType;
 					std::string creationType;
 				};
 				};

+ 15 - 0
ess/include/alibabacloud/ess/model/ModifyScalingConfigurationRequest.h

@@ -50,12 +50,16 @@ namespace AlibabaCloud
 
 
 				std::string getImageId()const;
 				std::string getImageId()const;
 				void setImageId(const std::string& imageId);
 				void setImageId(const std::string& imageId);
+				int getMemory()const;
+				void setMemory(int memory);
 				std::string getIoOptimized()const;
 				std::string getIoOptimized()const;
 				void setIoOptimized(const std::string& ioOptimized);
 				void setIoOptimized(const std::string& ioOptimized);
 				std::vector<std::string> getInstanceTypes()const;
 				std::vector<std::string> getInstanceTypes()const;
 				void setInstanceTypes(const std::vector<std::string>& instanceTypes);
 				void setInstanceTypes(const std::vector<std::string>& instanceTypes);
 				int getInternetMaxBandwidthOut()const;
 				int getInternetMaxBandwidthOut()const;
 				void setInternetMaxBandwidthOut(int internetMaxBandwidthOut);
 				void setInternetMaxBandwidthOut(int internetMaxBandwidthOut);
+				std::string getSecurityGroupId()const;
+				void setSecurityGroupId(const std::string& securityGroupId);
 				std::string getKeyPairName()const;
 				std::string getKeyPairName()const;
 				void setKeyPairName(const std::string& keyPairName);
 				void setKeyPairName(const std::string& keyPairName);
 				std::vector<SpotPriceLimit> getSpotPriceLimit()const;
 				std::vector<SpotPriceLimit> getSpotPriceLimit()const;
@@ -72,10 +76,16 @@ namespace AlibabaCloud
 				void setPasswordInherit(bool passwordInherit);
 				void setPasswordInherit(bool passwordInherit);
 				std::string getImageName()const;
 				std::string getImageName()const;
 				void setImageName(const std::string& imageName);
 				void setImageName(const std::string& imageName);
+				bool getOverride()const;
+				void setOverride(bool override);
+				std::string getDeploymentSetId()const;
+				void setDeploymentSetId(const std::string& deploymentSetId);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
 				std::string getOwnerAccount()const;
 				std::string getOwnerAccount()const;
 				void setOwnerAccount(const std::string& ownerAccount);
 				void setOwnerAccount(const std::string& ownerAccount);
+				int getCpu()const;
+				void setCpu(int cpu);
 				std::string getRamRoleName()const;
 				std::string getRamRoleName()const;
 				void setRamRoleName(const std::string& ramRoleName);
 				void setRamRoleName(const std::string& ramRoleName);
 				long getOwnerId()const;
 				long getOwnerId()const;
@@ -101,9 +111,11 @@ namespace AlibabaCloud
 
 
             private:
             private:
 				std::string imageId_;
 				std::string imageId_;
+				int memory_;
 				std::string ioOptimized_;
 				std::string ioOptimized_;
 				std::vector<std::string> instanceTypes_;
 				std::vector<std::string> instanceTypes_;
 				int internetMaxBandwidthOut_;
 				int internetMaxBandwidthOut_;
+				std::string securityGroupId_;
 				std::string keyPairName_;
 				std::string keyPairName_;
 				std::vector<SpotPriceLimit> spotPriceLimit_;
 				std::vector<SpotPriceLimit> spotPriceLimit_;
 				std::string systemDiskCategory_;
 				std::string systemDiskCategory_;
@@ -112,8 +124,11 @@ namespace AlibabaCloud
 				std::string hostName_;
 				std::string hostName_;
 				bool passwordInherit_;
 				bool passwordInherit_;
 				std::string imageName_;
 				std::string imageName_;
+				bool override_;
+				std::string deploymentSetId_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				std::string ownerAccount_;
+				int cpu_;
 				std::string ramRoleName_;
 				std::string ramRoleName_;
 				long ownerId_;
 				long ownerId_;
 				std::vector<DataDisk> dataDisk_;
 				std::vector<DataDisk> dataDisk_;

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

@@ -51,6 +51,8 @@ namespace AlibabaCloud
 				void setInstanceId20(const std::string& instanceId20);
 				void setInstanceId20(const std::string& instanceId20);
 				std::string getInstanceId1()const;
 				std::string getInstanceId1()const;
 				void setInstanceId1(const std::string& instanceId1);
 				void setInstanceId1(const std::string& instanceId1);
+				std::string getRemovePolicy()const;
+				void setRemovePolicy(const std::string& removePolicy);
 				std::string getInstanceId3()const;
 				std::string getInstanceId3()const;
 				void setInstanceId3(const std::string& instanceId3);
 				void setInstanceId3(const std::string& instanceId3);
 				std::string getResourceOwnerAccount()const;
 				std::string getResourceOwnerAccount()const;
@@ -97,6 +99,7 @@ namespace AlibabaCloud
 				std::string accessKeyId_;
 				std::string accessKeyId_;
 				std::string instanceId20_;
 				std::string instanceId20_;
 				std::string instanceId1_;
 				std::string instanceId1_;
+				std::string removePolicy_;
 				std::string instanceId3_;
 				std::string instanceId3_;
 				std::string resourceOwnerAccount_;
 				std::string resourceOwnerAccount_;
 				std::string instanceId2_;
 				std::string instanceId2_;

+ 3 - 39
ess/src/EssClient.cc

@@ -31,21 +31,21 @@ EssClient::EssClient(const Credentials &credentials, const ClientConfiguration &
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "ess");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 }
 
 
 EssClient::EssClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 EssClient::EssClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "ess");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 }
 
 
 EssClient::EssClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 EssClient::EssClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "ess");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 }
 
 
 EssClient::~EssClient()
 EssClient::~EssClient()
@@ -735,42 +735,6 @@ EssClient::ModifyAlarmOutcomeCallable EssClient::modifyAlarmCallable(const Modif
 	return task->get_future();
 	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::DeleteAlarmOutcome EssClient::deleteAlarm(const DeleteAlarmRequest &request) const
 EssClient::DeleteAlarmOutcome EssClient::deleteAlarm(const DeleteAlarmRequest &request) const
 {
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
 	auto endpointOutcome = endpointProvider_->getEndpoint();

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

@@ -36,6 +36,17 @@ void CreateScalingConfigurationRequest::setImageId(const std::string& imageId)
 	setParameter("ImageId", imageId);
 	setParameter("ImageId", imageId);
 }
 }
 
 
+int CreateScalingConfigurationRequest::getMemory()const
+{
+	return memory_;
+}
+
+void CreateScalingConfigurationRequest::setMemory(int memory)
+{
+	memory_ = memory;
+	setParameter("Memory", std::to_string(memory));
+}
+
 std::string CreateScalingConfigurationRequest::getScalingGroupId()const
 std::string CreateScalingConfigurationRequest::getScalingGroupId()const
 {
 {
 	return scalingGroupId_;
 	return scalingGroupId_;
@@ -175,6 +186,17 @@ void CreateScalingConfigurationRequest::setHostName(const std::string& hostName)
 	setParameter("HostName", hostName);
 	setParameter("HostName", hostName);
 }
 }
 
 
+std::string CreateScalingConfigurationRequest::getPassword()const
+{
+	return password_;
+}
+
+void CreateScalingConfigurationRequest::setPassword(const std::string& password)
+{
+	password_ = password;
+	setParameter("Password", password);
+}
+
 bool CreateScalingConfigurationRequest::getPasswordInherit()const
 bool CreateScalingConfigurationRequest::getPasswordInherit()const
 {
 {
 	return passwordInherit_;
 	return passwordInherit_;
@@ -208,6 +230,17 @@ void CreateScalingConfigurationRequest::setInstanceType(const std::string& insta
 	setParameter("InstanceType", instanceType);
 	setParameter("InstanceType", instanceType);
 }
 }
 
 
+std::string CreateScalingConfigurationRequest::getDeploymentSetId()const
+{
+	return deploymentSetId_;
+}
+
+void CreateScalingConfigurationRequest::setDeploymentSetId(const std::string& deploymentSetId)
+{
+	deploymentSetId_ = deploymentSetId;
+	setParameter("DeploymentSetId", deploymentSetId);
+}
+
 std::string CreateScalingConfigurationRequest::getResourceOwnerAccount()const
 std::string CreateScalingConfigurationRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;
@@ -230,6 +263,17 @@ void CreateScalingConfigurationRequest::setOwnerAccount(const std::string& owner
 	setParameter("OwnerAccount", ownerAccount);
 	setParameter("OwnerAccount", ownerAccount);
 }
 }
 
 
+int CreateScalingConfigurationRequest::getCpu()const
+{
+	return cpu_;
+}
+
+void CreateScalingConfigurationRequest::setCpu(int cpu)
+{
+	cpu_ = cpu;
+	setParameter("Cpu", std::to_string(cpu));
+}
+
 std::string CreateScalingConfigurationRequest::getRamRoleName()const
 std::string CreateScalingConfigurationRequest::getRamRoleName()const
 {
 {
 	return ramRoleName_;
 	return ramRoleName_;

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

@@ -158,6 +158,17 @@ void CreateScalingGroupRequest::setLaunchTemplateVersion(const std::string& laun
 	setParameter("LaunchTemplateVersion", launchTemplateVersion);
 	setParameter("LaunchTemplateVersion", launchTemplateVersion);
 }
 }
 
 
+std::string CreateScalingGroupRequest::getScalingPolicy()const
+{
+	return scalingPolicy_;
+}
+
+void CreateScalingGroupRequest::setScalingPolicy(const std::string& scalingPolicy)
+{
+	scalingPolicy_ = scalingPolicy;
+	setParameter("ScalingPolicy", scalingPolicy);
+}
+
 std::string CreateScalingGroupRequest::getAccessKeyId()const
 std::string CreateScalingGroupRequest::getAccessKeyId()const
 {
 {
 	return accessKeyId_;
 	return accessKeyId_;

+ 0 - 60
ess/src/model/DescribeAccountAttributesRequest.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;
-	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
-}
-
-long DescribeAccountAttributesRequest::getOwnerId()const
-{
-	return ownerId_;
-}
-
-void DescribeAccountAttributesRequest::setOwnerId(long ownerId)
-{
-	ownerId_ = ownerId;
-	setParameter("OwnerId", std::to_string(ownerId));
-}
-
-std::string DescribeAccountAttributesRequest::getAccessKeyId()const
-{
-	return accessKeyId_;
-}
-
-void DescribeAccountAttributesRequest::setAccessKeyId(const std::string& accessKeyId)
-{
-	accessKeyId_ = accessKeyId;
-	setParameter("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_;
-}
-

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

@@ -60,6 +60,10 @@ void DescribeScalingConfigurationsResult::parse(const std::string &payload)
 			scalingConfigurationsObject.hostName = value["HostName"].asString();
 			scalingConfigurationsObject.hostName = value["HostName"].asString();
 		if(!value["InstanceType"].isNull())
 		if(!value["InstanceType"].isNull())
 			scalingConfigurationsObject.instanceType = value["InstanceType"].asString();
 			scalingConfigurationsObject.instanceType = value["InstanceType"].asString();
+		if(!value["Cpu"].isNull())
+			scalingConfigurationsObject.cpu = std::stoi(value["Cpu"].asString());
+		if(!value["Memory"].isNull())
+			scalingConfigurationsObject.memory = std::stoi(value["Memory"].asString());
 		if(!value["InstanceGeneration"].isNull())
 		if(!value["InstanceGeneration"].isNull())
 			scalingConfigurationsObject.instanceGeneration = value["InstanceGeneration"].asString();
 			scalingConfigurationsObject.instanceGeneration = value["InstanceGeneration"].asString();
 		if(!value["SecurityGroupId"].isNull())
 		if(!value["SecurityGroupId"].isNull())

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

@@ -92,6 +92,10 @@ void DescribeScalingGroupsResult::parse(const std::string &payload)
 			scalingGroupsObject.multiAZPolicy = value["MultiAZPolicy"].asString();
 			scalingGroupsObject.multiAZPolicy = value["MultiAZPolicy"].asString();
 		if(!value["HealthCheckType"].isNull())
 		if(!value["HealthCheckType"].isNull())
 			scalingGroupsObject.healthCheckType = value["HealthCheckType"].asString();
 			scalingGroupsObject.healthCheckType = value["HealthCheckType"].asString();
+		if(!value["ScalingPolicy"].isNull())
+			scalingGroupsObject.scalingPolicy = value["ScalingPolicy"].asString();
+		if(!value["StoppedCapacity"].isNull())
+			scalingGroupsObject.stoppedCapacity = std::stoi(value["StoppedCapacity"].asString());
 		auto allVSwitchIds = value["VSwitchIds"]["VSwitchId"];
 		auto allVSwitchIds = value["VSwitchIds"]["VSwitchId"];
 		for (auto value : allVSwitchIds)
 		for (auto value : allVSwitchIds)
 			scalingGroupsObject.vSwitchIds.push_back(value.asString());
 			scalingGroupsObject.vSwitchIds.push_back(value.asString());

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

@@ -60,6 +60,10 @@ void DescribeScalingInstancesResult::parse(const std::string &payload)
 			scalingInstancesObject.creationTime = value["CreationTime"].asString();
 			scalingInstancesObject.creationTime = value["CreationTime"].asString();
 		if(!value["CreationType"].isNull())
 		if(!value["CreationType"].isNull())
 			scalingInstancesObject.creationType = value["CreationType"].asString();
 			scalingInstancesObject.creationType = value["CreationType"].asString();
+		if(!value["LaunchTemplateId"].isNull())
+			scalingInstancesObject.launchTemplateId = value["LaunchTemplateId"].asString();
+		if(!value["LaunchTemplateVersion"].isNull())
+			scalingInstancesObject.launchTemplateVersion = value["LaunchTemplateVersion"].asString();
 		scalingInstances_.push_back(scalingInstancesObject);
 		scalingInstances_.push_back(scalingInstancesObject);
 	}
 	}
 	if(!value["TotalCount"].isNull())
 	if(!value["TotalCount"].isNull())

+ 55 - 0
ess/src/model/ModifyScalingConfigurationRequest.cc

@@ -36,6 +36,17 @@ void ModifyScalingConfigurationRequest::setImageId(const std::string& imageId)
 	setParameter("ImageId", imageId);
 	setParameter("ImageId", imageId);
 }
 }
 
 
+int ModifyScalingConfigurationRequest::getMemory()const
+{
+	return memory_;
+}
+
+void ModifyScalingConfigurationRequest::setMemory(int memory)
+{
+	memory_ = memory;
+	setParameter("Memory", std::to_string(memory));
+}
+
 std::string ModifyScalingConfigurationRequest::getIoOptimized()const
 std::string ModifyScalingConfigurationRequest::getIoOptimized()const
 {
 {
 	return ioOptimized_;
 	return ioOptimized_;
@@ -70,6 +81,17 @@ void ModifyScalingConfigurationRequest::setInternetMaxBandwidthOut(int internetM
 	setParameter("InternetMaxBandwidthOut", std::to_string(internetMaxBandwidthOut));
 	setParameter("InternetMaxBandwidthOut", std::to_string(internetMaxBandwidthOut));
 }
 }
 
 
+std::string ModifyScalingConfigurationRequest::getSecurityGroupId()const
+{
+	return securityGroupId_;
+}
+
+void ModifyScalingConfigurationRequest::setSecurityGroupId(const std::string& securityGroupId)
+{
+	securityGroupId_ = securityGroupId;
+	setParameter("SecurityGroupId", securityGroupId);
+}
+
 std::string ModifyScalingConfigurationRequest::getKeyPairName()const
 std::string ModifyScalingConfigurationRequest::getKeyPairName()const
 {
 {
 	return keyPairName_;
 	return keyPairName_;
@@ -164,6 +186,28 @@ void ModifyScalingConfigurationRequest::setImageName(const std::string& imageNam
 	setParameter("ImageName", imageName);
 	setParameter("ImageName", imageName);
 }
 }
 
 
+bool ModifyScalingConfigurationRequest::getOverride()const
+{
+	return override_;
+}
+
+void ModifyScalingConfigurationRequest::setOverride(bool override)
+{
+	override_ = override;
+	setParameter("Override", std::to_string(override));
+}
+
+std::string ModifyScalingConfigurationRequest::getDeploymentSetId()const
+{
+	return deploymentSetId_;
+}
+
+void ModifyScalingConfigurationRequest::setDeploymentSetId(const std::string& deploymentSetId)
+{
+	deploymentSetId_ = deploymentSetId;
+	setParameter("DeploymentSetId", deploymentSetId);
+}
+
 std::string ModifyScalingConfigurationRequest::getResourceOwnerAccount()const
 std::string ModifyScalingConfigurationRequest::getResourceOwnerAccount()const
 {
 {
 	return resourceOwnerAccount_;
 	return resourceOwnerAccount_;
@@ -186,6 +230,17 @@ void ModifyScalingConfigurationRequest::setOwnerAccount(const std::string& owner
 	setParameter("OwnerAccount", ownerAccount);
 	setParameter("OwnerAccount", ownerAccount);
 }
 }
 
 
+int ModifyScalingConfigurationRequest::getCpu()const
+{
+	return cpu_;
+}
+
+void ModifyScalingConfigurationRequest::setCpu(int cpu)
+{
+	cpu_ = cpu;
+	setParameter("Cpu", std::to_string(cpu));
+}
+
 std::string ModifyScalingConfigurationRequest::getRamRoleName()const
 std::string ModifyScalingConfigurationRequest::getRamRoleName()const
 {
 {
 	return ramRoleName_;
 	return ramRoleName_;

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

@@ -113,6 +113,17 @@ void RemoveInstancesRequest::setInstanceId1(const std::string& instanceId1)
 	setParameter("InstanceId1", instanceId1);
 	setParameter("InstanceId1", instanceId1);
 }
 }
 
 
+std::string RemoveInstancesRequest::getRemovePolicy()const
+{
+	return removePolicy_;
+}
+
+void RemoveInstancesRequest::setRemovePolicy(const std::string& removePolicy)
+{
+	removePolicy_ = removePolicy;
+	setParameter("RemovePolicy", removePolicy);
+}
+
 std::string RemoveInstancesRequest::getInstanceId3()const
 std::string RemoveInstancesRequest::getInstanceId3()const
 {
 {
 	return instanceId3_;
 	return instanceId3_;