Browse Source

Generated 2016-04-08 for Emr.

sdk-team 5 năm trước cách đây
mục cha
commit
2a6631ce12
100 tập tin đã thay đổi với 443 bổ sung5269 xóa
  1. 3 0
      CHANGELOG
  2. 89 551
      emr/CMakeLists.txt
  3. 87 547
      emr/include/alibabacloud/emr/EmrClient.h
  4. 0 77
      emr/include/alibabacloud/emr/model/AddHpHostRequest.h
  5. 0 51
      emr/include/alibabacloud/emr/model/AddHpHostResult.h
  6. 0 53
      emr/include/alibabacloud/emr/model/AddResourceToUsersResult.h
  7. 21 21
      emr/include/alibabacloud/emr/model/AddScalingConfigItemV2Request.h
  8. 9 9
      emr/include/alibabacloud/emr/model/AddScalingConfigItemV2Result.h
  9. 0 66
      emr/include/alibabacloud/emr/model/AddUserResourceRoleRequest.h
  10. 0 53
      emr/include/alibabacloud/emr/model/AddUserResourceRoleResult.h
  11. 0 60
      emr/include/alibabacloud/emr/model/AttachClusterForNoteRequest.h
  12. 0 49
      emr/include/alibabacloud/emr/model/AttachClusterForNoteResult.h
  13. 0 60
      emr/include/alibabacloud/emr/model/AttachPubIpRequest.h
  14. 0 49
      emr/include/alibabacloud/emr/model/AttachPubIpResult.h
  15. 0 60
      emr/include/alibabacloud/emr/model/CancelETLJobReleaseRequest.h
  16. 0 49
      emr/include/alibabacloud/emr/model/CancelETLJobReleaseResult.h
  17. 0 63
      emr/include/alibabacloud/emr/model/CheckDataSourceRequest.h
  18. 0 51
      emr/include/alibabacloud/emr/model/CheckDataSourceResult.h
  19. 0 60
      emr/include/alibabacloud/emr/model/CloneDataSourceRequest.h
  20. 0 51
      emr/include/alibabacloud/emr/model/CloneDataSourceResult.h
  21. 0 51
      emr/include/alibabacloud/emr/model/CloneETLJobResult.h
  22. 0 51
      emr/include/alibabacloud/emr/model/CommonApiWhiteListResult.h
  23. 0 81
      emr/include/alibabacloud/emr/model/ContextQueryLogRequest.h
  24. 0 62
      emr/include/alibabacloud/emr/model/ContextQueryLogResult.h
  25. 0 69
      emr/include/alibabacloud/emr/model/CreateAlertContactRequest.h
  26. 0 63
      emr/include/alibabacloud/emr/model/CreateAlertDingDingGroupRequest.h
  27. 0 51
      emr/include/alibabacloud/emr/model/CreateAlertDingDingGroupResult.h
  28. 0 69
      emr/include/alibabacloud/emr/model/CreateBackupRuleRequest.h
  29. 0 73
      emr/include/alibabacloud/emr/model/CreateBatchUsersRequest.h
  30. 0 53
      emr/include/alibabacloud/emr/model/CreateBatchUsersResult.h
  31. 31 27
      emr/include/alibabacloud/emr/model/CreateClusterBootstrapActionRequest.h
  32. 7 7
      emr/include/alibabacloud/emr/model/CreateClusterBootstrapActionResult.h
  33. 0 53
      emr/include/alibabacloud/emr/model/CreateClusterHostGroupResult.h
  34. 0 69
      emr/include/alibabacloud/emr/model/CreateClusterScriptRequest.h
  35. 0 51
      emr/include/alibabacloud/emr/model/CreateClusterScriptResult.h
  36. 14 0
      emr/include/alibabacloud/emr/model/CreateClusterTemplateRequest.h
  37. 18 0
      emr/include/alibabacloud/emr/model/CreateClusterV2Request.h
  38. 0 113
      emr/include/alibabacloud/emr/model/CreateClusterWithHostPoolRequest.h
  39. 0 55
      emr/include/alibabacloud/emr/model/CreateClusterWithHostPoolResult.h
  40. 3 0
      emr/include/alibabacloud/emr/model/CreateClusterWithTemplateRequest.h
  41. 3 0
      emr/include/alibabacloud/emr/model/CreateDataSourceRequest.h
  42. 0 72
      emr/include/alibabacloud/emr/model/CreateETLJobRequest.h
  43. 0 51
      emr/include/alibabacloud/emr/model/CreateETLJobResult.h
  44. 3 0
      emr/include/alibabacloud/emr/model/CreateExecutionPlanRequest.h
  45. 9 0
      emr/include/alibabacloud/emr/model/CreateFlowForWebRequest.h
  46. 3 0
      emr/include/alibabacloud/emr/model/CreateFlowJobRequest.h
  47. 6 0
      emr/include/alibabacloud/emr/model/CreateFlowProjectRequest.h
  48. 9 0
      emr/include/alibabacloud/emr/model/CreateFlowRequest.h
  49. 0 73
      emr/include/alibabacloud/emr/model/CreateHostPoolRequest.h
  50. 0 51
      emr/include/alibabacloud/emr/model/CreateHostPoolResult.h
  51. 3 0
      emr/include/alibabacloud/emr/model/CreateJobRequest.h
  52. 27 24
      emr/include/alibabacloud/emr/model/CreateLibraryRequest.h
  53. 7 7
      emr/include/alibabacloud/emr/model/CreateLibraryResult.h
  54. 3 0
      emr/include/alibabacloud/emr/model/CreateMetaTablePreviewTaskRequest.h
  55. 0 51
      emr/include/alibabacloud/emr/model/CreateNavNodeResult.h
  56. 3 0
      emr/include/alibabacloud/emr/model/CreateNoteRequest.h
  57. 12 12
      emr/include/alibabacloud/emr/model/CreateScalingGroupV2Request.h
  58. 9 9
      emr/include/alibabacloud/emr/model/CreateScalingGroupV2Result.h
  59. 6 0
      emr/include/alibabacloud/emr/model/CreateScalingRuleRequest.h
  60. 0 113
      emr/include/alibabacloud/emr/model/CreateScalingTaskGroupRequest.h
  61. 0 51
      emr/include/alibabacloud/emr/model/CreateScalingTaskGroupResult.h
  62. 0 66
      emr/include/alibabacloud/emr/model/CreateUserGroupRequest.h
  63. 0 53
      emr/include/alibabacloud/emr/model/CreateUserGroupResult.h
  64. 0 70
      emr/include/alibabacloud/emr/model/CreateUserPasswordRequest.h
  65. 0 54
      emr/include/alibabacloud/emr/model/CreateUserStatisticsRequest.h
  66. 0 49
      emr/include/alibabacloud/emr/model/CreateUserStatisticsResult.h
  67. 18 12
      emr/include/alibabacloud/emr/model/DecommissionHostComponentRequest.h
  68. 7 7
      emr/include/alibabacloud/emr/model/DecommissionHostComponentResult.h
  69. 0 57
      emr/include/alibabacloud/emr/model/DeleteAlertContactsRequest.h
  70. 0 51
      emr/include/alibabacloud/emr/model/DeleteAlertContactsResult.h
  71. 0 53
      emr/include/alibabacloud/emr/model/DeleteBatchResourceUsersResult.h
  72. 0 57
      emr/include/alibabacloud/emr/model/DeleteClusterScriptRequest.h
  73. 0 49
      emr/include/alibabacloud/emr/model/DeleteClusterScriptResult.h
  74. 3 0
      emr/include/alibabacloud/emr/model/DeleteClusterTemplateRequest.h
  75. 0 57
      emr/include/alibabacloud/emr/model/DeleteETLJobRequest.h
  76. 0 49
      emr/include/alibabacloud/emr/model/DeleteETLJobResult.h
  77. 0 51
      emr/include/alibabacloud/emr/model/DeleteFlowProjectByIdRequest.h
  78. 0 51
      emr/include/alibabacloud/emr/model/DeleteFlowProjectByIdResult.h
  79. 0 49
      emr/include/alibabacloud/emr/model/DeleteHostPoolResult.h
  80. 3 0
      emr/include/alibabacloud/emr/model/DeleteJobRequest.h
  81. 12 12
      emr/include/alibabacloud/emr/model/DeleteLibrariesRequest.h
  82. 7 7
      emr/include/alibabacloud/emr/model/DeleteLibrariesResult.h
  83. 0 60
      emr/include/alibabacloud/emr/model/DeleteNavNodeRequest.h
  84. 0 49
      emr/include/alibabacloud/emr/model/DeleteNavNodeResult.h
  85. 3 0
      emr/include/alibabacloud/emr/model/DeleteNoteRequest.h
  86. 0 60
      emr/include/alibabacloud/emr/model/DeleteParagraphRequest.h
  87. 0 49
      emr/include/alibabacloud/emr/model/DeleteParagraphResult.h
  88. 0 63
      emr/include/alibabacloud/emr/model/DeleteResourceUserRequest.h
  89. 0 53
      emr/include/alibabacloud/emr/model/DeleteResourceUserResult.h
  90. 0 60
      emr/include/alibabacloud/emr/model/DeleteScalingTaskGroupRequest.h
  91. 0 51
      emr/include/alibabacloud/emr/model/DeleteScalingTaskGroupResult.h
  92. 0 57
      emr/include/alibabacloud/emr/model/DeleteUserGroupRequest.h
  93. 0 53
      emr/include/alibabacloud/emr/model/DeleteUserGroupResult.h
  94. 0 66
      emr/include/alibabacloud/emr/model/DeleteUserResourceRoleRequest.h
  95. 0 53
      emr/include/alibabacloud/emr/model/DeleteUserResourceRoleResult.h
  96. 0 57
      emr/include/alibabacloud/emr/model/DescribeAvailableInstanceTypeRequest.h
  97. 0 61
      emr/include/alibabacloud/emr/model/DescribeAvailableInstanceTypeResult.h
  98. 5 0
      emr/include/alibabacloud/emr/model/DescribeClusterBasicInfoResult.h
  99. 0 63
      emr/include/alibabacloud/emr/model/DescribeClusterOpLogRequest.h
  100. 0 68
      emr/include/alibabacloud/emr/model/DescribeClusterOpLogResult.h

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-12-25 Version: patch
+- Generated 2016-04-08 for `Emr`.
+
 2020-12-25 Version: patch
 2020-12-25 Version: patch
 - Supported for weboffice edit.
 - Supported for weboffice edit.
 
 

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 89 - 551
emr/CMakeLists.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 87 - 547
emr/include/alibabacloud/emr/EmrClient.h


+ 0 - 77
emr/include/alibabacloud/emr/model/AddHpHostRequest.h

@@ -1,77 +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_EMR_MODEL_ADDHPHOSTREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_ADDHPHOSTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AddHpHostRequest : public RpcServiceRequest
-			{
-				struct HpHost
-				{
-					int cpuCore;
-					int memSize;
-					std::string rackInfo;
-					std::string role;
-					std::string serialNumber;
-					std::string hostType;
-					std::string securityGroupId;
-					RepeatList hpHostDisk;
-					std::string vswitchId;
-					std::string externalKey;
-					std::string hostName;
-					std::string vpcId;
-					std::string innerIp;
-					std::string externalIp;
-				};
-
-			public:
-				AddHpHostRequest();
-				~AddHpHostRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::vector<HpHost> getHpHost()const;
-				void setHpHost(const std::vector<HpHost>& hpHost);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getHpBizId()const;
-				void setHpBizId(const std::string& hpBizId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::vector<HpHost> hpHost_;
-				std::string regionId_;
-				std::string hpBizId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ADDHPHOSTREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/AddHpHostResult.h

@@ -1,51 +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_EMR_MODEL_ADDHPHOSTRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_ADDHPHOSTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AddHpHostResult : public ServiceResult
-			{
-			public:
-
-
-				AddHpHostResult();
-				explicit AddHpHostResult(const std::string &payload);
-				~AddHpHostResult();
-				std::string getBizId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string bizId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ADDHPHOSTRESULT_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/AddResourceToUsersResult.h

@@ -1,53 +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_EMR_MODEL_ADDRESOURCETOUSERSRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_ADDRESOURCETOUSERSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AddResourceToUsersResult : public ServiceResult
-			{
-			public:
-
-
-				AddResourceToUsersResult();
-				explicit AddResourceToUsersResult(const std::string &payload);
-				~AddResourceToUsersResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ADDRESOURCETOUSERSRESULT_H_

+ 21 - 21
emr/include/alibabacloud/emr/model/CreateClusterHostGroupRequest.h → emr/include/alibabacloud/emr/model/AddScalingConfigItemV2Request.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_CREATECLUSTERHOSTGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERHOSTGROUPREQUEST_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_ADDSCALINGCONFIGITEMV2REQUEST_H_
+#define ALIBABACLOUD_EMR_MODEL_ADDSCALINGCONFIGITEMV2REQUEST_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -28,39 +28,39 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT CreateClusterHostGroupRequest : public RpcServiceRequest
+			class ALIBABACLOUD_EMR_EXPORT AddScalingConfigItemV2Request : public RpcServiceRequest
 			{
 			{
 
 
 			public:
 			public:
-				CreateClusterHostGroupRequest();
-				~CreateClusterHostGroupRequest();
+				AddScalingConfigItemV2Request();
+				~AddScalingConfigItemV2Request();
 
 
+				std::string getConfigItemType()const;
+				void setConfigItemType(const std::string& configItemType);
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getComment()const;
-				void setComment(const std::string& comment);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getHostGroupName()const;
-				void setHostGroupName(const std::string& hostGroupName);
-				std::string getHostGroupType()const;
-				void setHostGroupType(const std::string& hostGroupType);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getScalingGroupBizId()const;
+				void setScalingGroupBizId(const std::string& scalingGroupBizId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getConfigItemInformation()const;
+				void setConfigItemInformation(const std::string& configItemInformation);
 
 
             private:
             private:
+				std::string configItemType_;
 				long resourceOwnerId_;
 				long resourceOwnerId_;
-				std::string regionId_;
-				std::string comment_;
-				std::string clusterId_;
-				std::string hostGroupName_;
-				std::string hostGroupType_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string scalingGroupBizId_;
+				std::string resourceGroupId_;
+				std::string regionId_;
+				std::string configItemInformation_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERHOSTGROUPREQUEST_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_ADDSCALINGCONFIGITEMV2REQUEST_H_

+ 9 - 9
emr/include/alibabacloud/emr/model/CreateVerificationCodeResult.h → emr/include/alibabacloud/emr/model/AddScalingConfigItemV2Result.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_CREATEVERIFICATIONCODERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEVERIFICATIONCODERESULT_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_ADDSCALINGCONFIGITEMV2RESULT_H_
+#define ALIBABACLOUD_EMR_MODEL_ADDSCALINGCONFIGITEMV2RESULT_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -29,23 +29,23 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT CreateVerificationCodeResult : public ServiceResult
+			class ALIBABACLOUD_EMR_EXPORT AddScalingConfigItemV2Result : public ServiceResult
 			{
 			{
 			public:
 			public:
 
 
 
 
-				CreateVerificationCodeResult();
-				explicit CreateVerificationCodeResult(const std::string &payload);
-				~CreateVerificationCodeResult();
-				long getStatus()const;
+				AddScalingConfigItemV2Result();
+				explicit AddScalingConfigItemV2Result(const std::string &payload);
+				~AddScalingConfigItemV2Result();
+				std::string getData()const;
 
 
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
-				long status_;
+				std::string data_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEVERIFICATIONCODERESULT_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_ADDSCALINGCONFIGITEMV2RESULT_H_

+ 0 - 66
emr/include/alibabacloud/emr/model/AddUserResourceRoleRequest.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_EMR_MODEL_ADDUSERRESOURCEROLEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_ADDUSERRESOURCEROLEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AddUserResourceRoleRequest : public RpcServiceRequest
-			{
-
-			public:
-				AddUserResourceRoleRequest();
-				~AddUserResourceRoleRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceId()const;
-				void setResourceId(const std::string& resourceId);
-				long getRoleId()const;
-				void setRoleId(long roleId);
-				std::string getResourceType()const;
-				void setResourceType(const std::string& resourceType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getAliyunUserId()const;
-				void setAliyunUserId(const std::string& aliyunUserId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceId_;
-				long roleId_;
-				std::string resourceType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string aliyunUserId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ADDUSERRESOURCEROLEREQUEST_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/AddUserResourceRoleResult.h

@@ -1,53 +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_EMR_MODEL_ADDUSERRESOURCEROLERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_ADDUSERRESOURCEROLERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AddUserResourceRoleResult : public ServiceResult
-			{
-			public:
-
-
-				AddUserResourceRoleResult();
-				explicit AddUserResourceRoleResult(const std::string &payload);
-				~AddUserResourceRoleResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ADDUSERRESOURCEROLERESULT_H_

+ 0 - 60
emr/include/alibabacloud/emr/model/AttachClusterForNoteRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_ATTACHCLUSTERFORNOTEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_ATTACHCLUSTERFORNOTEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AttachClusterForNoteRequest : public RpcServiceRequest
-			{
-
-			public:
-				AttachClusterForNoteRequest();
-				~AttachClusterForNoteRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string id_;
-				std::string clusterId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ATTACHCLUSTERFORNOTEREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/AttachClusterForNoteResult.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_EMR_MODEL_ATTACHCLUSTERFORNOTERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_ATTACHCLUSTERFORNOTERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AttachClusterForNoteResult : public ServiceResult
-			{
-			public:
-
-
-				AttachClusterForNoteResult();
-				explicit AttachClusterForNoteResult(const std::string &payload);
-				~AttachClusterForNoteResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ATTACHCLUSTERFORNOTERESULT_H_

+ 0 - 60
emr/include/alibabacloud/emr/model/AttachPubIpRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_ATTACHPUBIPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_ATTACHPUBIPREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AttachPubIpRequest : public RpcServiceRequest
-			{
-
-			public:
-				AttachPubIpRequest();
-				~AttachPubIpRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::vector<std::string> getInstanceIds()const;
-				void setInstanceIds(const std::vector<std::string>& instanceIds);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::vector<std::string> instanceIds_;
-				std::string clusterId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ATTACHPUBIPREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/AttachPubIpResult.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_EMR_MODEL_ATTACHPUBIPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_ATTACHPUBIPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT AttachPubIpResult : public ServiceResult
-			{
-			public:
-
-
-				AttachPubIpResult();
-				explicit AttachPubIpResult(const std::string &payload);
-				~AttachPubIpResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_ATTACHPUBIPRESULT_H_

+ 0 - 60
emr/include/alibabacloud/emr/model/CancelETLJobReleaseRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_CANCELETLJOBRELEASEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CANCELETLJOBRELEASEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CancelETLJobReleaseRequest : public RpcServiceRequest
-			{
-
-			public:
-				CancelETLJobReleaseRequest();
-				~CancelETLJobReleaseRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getEtlJobId()const;
-				void setEtlJobId(const std::string& etlJobId);
-				std::string getReleaseId()const;
-				void setReleaseId(const std::string& releaseId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string etlJobId_;
-				std::string releaseId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CANCELETLJOBRELEASEREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/CancelETLJobReleaseResult.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_EMR_MODEL_CANCELETLJOBRELEASERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CANCELETLJOBRELEASERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CancelETLJobReleaseResult : public ServiceResult
-			{
-			public:
-
-
-				CancelETLJobReleaseResult();
-				explicit CancelETLJobReleaseResult(const std::string &payload);
-				~CancelETLJobReleaseResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CANCELETLJOBRELEASERESULT_H_

+ 0 - 63
emr/include/alibabacloud/emr/model/CheckDataSourceRequest.h

@@ -1,63 +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_EMR_MODEL_CHECKDATASOURCEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CHECKDATASOURCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CheckDataSourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CheckDataSourceRequest();
-				~CheckDataSourceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getConf()const;
-				void setConf(const std::string& conf);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string conf_;
-				std::string id_;
-				std::string clusterId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CHECKDATASOURCEREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CheckDataSourceResult.h

@@ -1,51 +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_EMR_MODEL_CHECKDATASOURCERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CHECKDATASOURCERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CheckDataSourceResult : public ServiceResult
-			{
-			public:
-
-
-				CheckDataSourceResult();
-				explicit CheckDataSourceResult(const std::string &payload);
-				~CheckDataSourceResult();
-				std::string getCommandId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string commandId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CHECKDATASOURCERESULT_H_

+ 0 - 60
emr/include/alibabacloud/emr/model/CloneDataSourceRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_CLONEDATASOURCEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CLONEDATASOURCEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CloneDataSourceRequest : public RpcServiceRequest
-			{
-
-			public:
-				CloneDataSourceRequest();
-				~CloneDataSourceRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string name_;
-				std::string id_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CLONEDATASOURCEREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CloneDataSourceResult.h

@@ -1,51 +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_EMR_MODEL_CLONEDATASOURCERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CLONEDATASOURCERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CloneDataSourceResult : public ServiceResult
-			{
-			public:
-
-
-				CloneDataSourceResult();
-				explicit CloneDataSourceResult(const std::string &payload);
-				~CloneDataSourceResult();
-				std::string getId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string id_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CLONEDATASOURCERESULT_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CloneETLJobResult.h

@@ -1,51 +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_EMR_MODEL_CLONEETLJOBRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CLONEETLJOBRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CloneETLJobResult : public ServiceResult
-			{
-			public:
-
-
-				CloneETLJobResult();
-				explicit CloneETLJobResult(const std::string &payload);
-				~CloneETLJobResult();
-				std::string getId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string id_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CLONEETLJOBRESULT_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CommonApiWhiteListResult.h

@@ -1,51 +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_EMR_MODEL_COMMONAPIWHITELISTRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_COMMONAPIWHITELISTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CommonApiWhiteListResult : public ServiceResult
-			{
-			public:
-
-
-				CommonApiWhiteListResult();
-				explicit CommonApiWhiteListResult(const std::string &payload);
-				~CommonApiWhiteListResult();
-				std::string getWhiteList()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string whiteList_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_COMMONAPIWHITELISTRESULT_H_

+ 0 - 81
emr/include/alibabacloud/emr/model/ContextQueryLogRequest.h

@@ -1,81 +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_EMR_MODEL_CONTEXTQUERYLOGREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CONTEXTQUERYLOGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT ContextQueryLogRequest : public RpcServiceRequest
-			{
-
-			public:
-				ContextQueryLogRequest();
-				~ContextQueryLogRequest();
-
-				std::string getPackId()const;
-				void setPackId(const std::string& packId);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getTotalOffset()const;
-				void setTotalOffset(int totalOffset);
-				int getSize()const;
-				void setSize(int size);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getPackMeta()const;
-				void setPackMeta(const std::string& packMeta);
-				int getFrom()const;
-				void setFrom(int from);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				int getTo()const;
-				void setTo(int to);
-				bool getReverse()const;
-				void setReverse(bool reverse);
-				std::string getLogStore()const;
-				void setLogStore(const std::string& logStore);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string packId_;
-				long resourceOwnerId_;
-				int totalOffset_;
-				int size_;
-				std::string regionId_;
-				std::string packMeta_;
-				int from_;
-				std::string clusterId_;
-				int to_;
-				bool reverse_;
-				std::string logStore_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CONTEXTQUERYLOGREQUEST_H_

+ 0 - 62
emr/include/alibabacloud/emr/model/ContextQueryLogResult.h

@@ -1,62 +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_EMR_MODEL_CONTEXTQUERYLOGRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CONTEXTQUERYLOGRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT ContextQueryLogResult : public ServiceResult
-			{
-			public:
-				struct Item
-				{
-					std::string content;
-					int index;
-				};
-
-
-				ContextQueryLogResult();
-				explicit ContextQueryLogResult(const std::string &payload);
-				~ContextQueryLogResult();
-				std::string getTime()const;
-				std::vector<Item> getLogs()const;
-				std::string getPackMeta()const;
-				std::string getPackId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string time_;
-				std::vector<Item> logs_;
-				std::string packMeta_;
-				std::string packId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CONTEXTQUERYLOGRESULT_H_

+ 0 - 69
emr/include/alibabacloud/emr/model/CreateAlertContactRequest.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_EMR_MODEL_CREATEALERTCONTACTREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEALERTCONTACTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateAlertContactRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateAlertContactRequest();
-				~CreateAlertContactRequest();
-
-				std::string getEmailVerificationCode()const;
-				void setEmailVerificationCode(const std::string& emailVerificationCode);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getPhoneNumberVerificationCode()const;
-				void setPhoneNumberVerificationCode(const std::string& phoneNumberVerificationCode);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getPhoneNumber()const;
-				void setPhoneNumber(const std::string& phoneNumber);
-				std::string getEmail()const;
-				void setEmail(const std::string& email);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string emailVerificationCode_;
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string phoneNumberVerificationCode_;
-				std::string name_;
-				std::string phoneNumber_;
-				std::string email_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEALERTCONTACTREQUEST_H_

+ 0 - 63
emr/include/alibabacloud/emr/model/CreateAlertDingDingGroupRequest.h

@@ -1,63 +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_EMR_MODEL_CREATEALERTDINGDINGGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEALERTDINGDINGGROUPREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateAlertDingDingGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateAlertDingDingGroupRequest();
-				~CreateAlertDingDingGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getWebHookUrl()const;
-				void setWebHookUrl(const std::string& webHookUrl);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string name_;
-				std::string description_;
-				std::string accessKeyId_;
-				std::string webHookUrl_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEALERTDINGDINGGROUPREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CreateAlertDingDingGroupResult.h

@@ -1,51 +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_EMR_MODEL_CREATEALERTDINGDINGGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEALERTDINGDINGGROUPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateAlertDingDingGroupResult : public ServiceResult
-			{
-			public:
-
-
-				CreateAlertDingDingGroupResult();
-				explicit CreateAlertDingDingGroupResult(const std::string &payload);
-				~CreateAlertDingDingGroupResult();
-				long getId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				long id_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEALERTDINGDINGGROUPRESULT_H_

+ 0 - 69
emr/include/alibabacloud/emr/model/CreateBackupRuleRequest.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_EMR_MODEL_CREATEBACKUPRULEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEBACKUPRULEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateBackupRuleRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateBackupRuleRequest();
-				~CreateBackupRuleRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getBackupMethodType()const;
-				void setBackupMethodType(const std::string& backupMethodType);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getBackupPlanId()const;
-				void setBackupPlanId(const std::string& backupPlanId);
-				std::string getMetadataType()const;
-				void setMetadataType(const std::string& metadataType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
-
-            private:
-				long resourceOwnerId_;
-				std::string backupMethodType_;
-				std::string description_;
-				std::string backupPlanId_;
-				std::string metadataType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string name_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEBACKUPRULEREQUEST_H_

+ 0 - 73
emr/include/alibabacloud/emr/model/CreateBatchUsersRequest.h

@@ -1,73 +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_EMR_MODEL_CREATEBATCHUSERSREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEBATCHUSERSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateBatchUsersRequest : public RpcServiceRequest
-			{
-				struct UserBaseParamList
-				{
-					std::string aliyunUserId;
-					std::string userName;
-					std::string userType;
-					std::string isSuperAdmin;
-				};
-
-			public:
-				CreateBatchUsersRequest();
-				~CreateBatchUsersRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::vector<UserBaseParamList> getUserBaseParamList()const;
-				void setUserBaseParamList(const std::vector<UserBaseParamList>& userBaseParamList);
-				std::vector<long> getRoleId()const;
-				void setRoleId(const std::vector<long>& roleId);
-				std::vector<long> getGroupId()const;
-				void setGroupId(const std::vector<long>& groupId);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-
-            private:
-				long resourceOwnerId_;
-				std::vector<UserBaseParamList> userBaseParamList_;
-				std::vector<long> roleId_;
-				std::vector<long> groupId_;
-				std::string description_;
-				std::string accessKeyId_;
-				std::string regionId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEBATCHUSERSREQUEST_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/CreateBatchUsersResult.h

@@ -1,53 +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_EMR_MODEL_CREATEBATCHUSERSRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEBATCHUSERSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateBatchUsersResult : public ServiceResult
-			{
-			public:
-
-
-				CreateBatchUsersResult();
-				explicit CreateBatchUsersResult(const std::string &payload);
-				~CreateBatchUsersResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEBATCHUSERSRESULT_H_

+ 31 - 27
emr/include/alibabacloud/emr/model/StartKafkaBrokerDiskBalancerRequest.h → emr/include/alibabacloud/emr/model/CreateClusterBootstrapActionRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_STARTKAFKABROKERDISKBALANCERREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_STARTKAFKABROKERDISKBALANCERREQUEST_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_CREATECLUSTERBOOTSTRAPACTIONREQUEST_H_
+#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERBOOTSTRAPACTIONREQUEST_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -28,39 +28,43 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT StartKafkaBrokerDiskBalancerRequest : public RpcServiceRequest
+			class ALIBABACLOUD_EMR_EXPORT CreateClusterBootstrapActionRequest : public RpcServiceRequest
 			{
 			{
+			public:
+				struct BootstrapAction
+				{
+					std::string path;
+					std::string executionTarget;
+					std::string executionMoment;
+					std::string arg;
+					std::string name;
+					std::string executionFailStrategy;
+				};
 
 
 			public:
 			public:
-				StartKafkaBrokerDiskBalancerRequest();
-				~StartKafkaBrokerDiskBalancerRequest();
+				CreateClusterBootstrapActionRequest();
+				~CreateClusterBootstrapActionRequest();
 
 
-				long getThrottle()const;
-				void setThrottle(long throttle);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				int getBrokerId()const;
-				void setBrokerId(int brokerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getBalanceThreshold()const;
-				void setBalanceThreshold(const std::string& balanceThreshold);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getClusterId()const;
+				void setClusterId(const std::string& clusterId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::vector<BootstrapAction> getBootstrapAction()const;
+				void setBootstrapAction(const std::vector<BootstrapAction>& bootstrapAction);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
 
 
             private:
             private:
-				long throttle_;
-				long resourceOwnerId_;
-				int brokerId_;
-				std::string regionId_;
-				std::string clusterId_;
-				std::string balanceThreshold_;
-				std::string accessKeyId_;
+				long resourceOwnerId_;
+				std::string clusterId_;
+				std::string accessKeyId_;
+				std::vector<BootstrapAction> bootstrapAction_;
+				std::string regionId_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_STARTKAFKABROKERDISKBALANCERREQUEST_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERBOOTSTRAPACTIONREQUEST_H_

+ 7 - 7
emr/include/alibabacloud/emr/model/ModifyExecutionPlanBasicInfoResult.h → emr/include/alibabacloud/emr/model/CreateClusterBootstrapActionResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_MODIFYEXECUTIONPLANBASICINFORESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_MODIFYEXECUTIONPLANBASICINFORESULT_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_CREATECLUSTERBOOTSTRAPACTIONRESULT_H_
+#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERBOOTSTRAPACTIONRESULT_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT ModifyExecutionPlanBasicInfoResult : public ServiceResult
+			class ALIBABACLOUD_EMR_EXPORT CreateClusterBootstrapActionResult : public ServiceResult
 			{
 			{
 			public:
 			public:
 
 
 
 
-				ModifyExecutionPlanBasicInfoResult();
-				explicit ModifyExecutionPlanBasicInfoResult(const std::string &payload);
-				~ModifyExecutionPlanBasicInfoResult();
+				CreateClusterBootstrapActionResult();
+				explicit CreateClusterBootstrapActionResult(const std::string &payload);
+				~CreateClusterBootstrapActionResult();
 
 
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
@@ -46,4 +46,4 @@ namespace AlibabaCloud
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_MODIFYEXECUTIONPLANBASICINFORESULT_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERBOOTSTRAPACTIONRESULT_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/CreateClusterHostGroupResult.h

@@ -1,53 +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_EMR_MODEL_CREATECLUSTERHOSTGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERHOSTGROUPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateClusterHostGroupResult : public ServiceResult
-			{
-			public:
-
-
-				CreateClusterHostGroupResult();
-				explicit CreateClusterHostGroupResult(const std::string &payload);
-				~CreateClusterHostGroupResult();
-				std::string getHostGroupId()const;
-				std::string getClusterId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string hostGroupId_;
-				std::string clusterId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERHOSTGROUPRESULT_H_

+ 0 - 69
emr/include/alibabacloud/emr/model/CreateClusterScriptRequest.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_EMR_MODEL_CREATECLUSTERSCRIPTREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERSCRIPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateClusterScriptRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateClusterScriptRequest();
-				~CreateClusterScriptRequest();
-
-				std::string getArgs()const;
-				void setArgs(const std::string& args);
-				std::string getPath()const;
-				void setPath(const std::string& path);
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getNodeIdList()const;
-				void setNodeIdList(const std::string& nodeIdList);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				std::string args_;
-				std::string path_;
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string name_;
-				std::string clusterId_;
-				std::string nodeIdList_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERSCRIPTREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CreateClusterScriptResult.h

@@ -1,51 +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_EMR_MODEL_CREATECLUSTERSCRIPTRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERSCRIPTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateClusterScriptResult : public ServiceResult
-			{
-			public:
-
-
-				CreateClusterScriptResult();
-				explicit CreateClusterScriptResult(const std::string &payload);
-				~CreateClusterScriptResult();
-				std::string getId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string id_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERSCRIPTRESULT_H_

+ 14 - 0
emr/include/alibabacloud/emr/model/CreateClusterTemplateRequest.h

@@ -34,8 +34,16 @@ namespace AlibabaCloud
 				struct BootstrapAction
 				struct BootstrapAction
 				{
 				{
 					std::string path;
 					std::string path;
+					std::string executionTarget;
+					std::string executionMoment;
 					std::string arg;
 					std::string arg;
 					std::string name;
 					std::string name;
+					std::string executionFailStrategy;
+				};
+				struct Tag
+				{
+					std::string value;
+					std::string key;
 				};
 				};
 				struct HostGroup
 				struct HostGroup
 				{
 				{
@@ -90,12 +98,16 @@ namespace AlibabaCloud
 				void setSecurityGroupName(const std::string& securityGroupName);
 				void setSecurityGroupName(const std::string& securityGroupName);
 				std::string getMachineType()const;
 				std::string getMachineType()const;
 				void setMachineType(const std::string& machineType);
 				void setMachineType(const std::string& machineType);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::vector<BootstrapAction> getBootstrapAction()const;
 				std::vector<BootstrapAction> getBootstrapAction()const;
 				void setBootstrapAction(const std::vector<BootstrapAction>& bootstrapAction);
 				void setBootstrapAction(const std::vector<BootstrapAction>& bootstrapAction);
 				std::string getMetaStoreConf()const;
 				std::string getMetaStoreConf()const;
 				void setMetaStoreConf(const std::string& metaStoreConf);
 				void setMetaStoreConf(const std::string& metaStoreConf);
 				std::string getEmrVer()const;
 				std::string getEmrVer()const;
 				void setEmrVer(const std::string& emrVer);
 				void setEmrVer(const std::string& emrVer);
+				std::vector<Tag> getTag()const;
+				void setTag(const std::vector<Tag>& tag);
 				bool getIsOpenPublicIp()const;
 				bool getIsOpenPublicIp()const;
 				void setIsOpenPublicIp(bool isOpenPublicIp);
 				void setIsOpenPublicIp(bool isOpenPublicIp);
 				int getPeriod()const;
 				int getPeriod()const;
@@ -155,9 +167,11 @@ namespace AlibabaCloud
 				std::string metaStoreType_;
 				std::string metaStoreType_;
 				std::string securityGroupName_;
 				std::string securityGroupName_;
 				std::string machineType_;
 				std::string machineType_;
+				std::string resourceGroupId_;
 				std::vector<BootstrapAction> bootstrapAction_;
 				std::vector<BootstrapAction> bootstrapAction_;
 				std::string metaStoreConf_;
 				std::string metaStoreConf_;
 				std::string emrVer_;
 				std::string emrVer_;
+				std::vector<Tag> tag_;
 				bool isOpenPublicIp_;
 				bool isOpenPublicIp_;
 				int period_;
 				int period_;
 				std::string instanceGeneration_;
 				std::string instanceGeneration_;

+ 18 - 0
emr/include/alibabacloud/emr/model/CreateClusterV2Request.h

@@ -40,8 +40,11 @@ namespace AlibabaCloud
 				struct BootstrapAction
 				struct BootstrapAction
 				{
 				{
 					std::string path;
 					std::string path;
+					std::string executionTarget;
+					std::string executionMoment;
 					std::string arg;
 					std::string arg;
 					std::string name;
 					std::string name;
+					std::string executionFailStrategy;
 				};
 				};
 				struct Tag
 				struct Tag
 				{
 				{
@@ -54,6 +57,12 @@ namespace AlibabaCloud
 					std::string userId;
 					std::string userId;
 					std::string userName;
 					std::string userName;
 				};
 				};
+				struct PromotionInfo
+				{
+					std::string promotionOptionCode;
+					std::string productCode;
+					std::string promotionOptionNo;
+				};
 				struct HostGroup
 				struct HostGroup
 				{
 				{
 					int period;
 					int period;
@@ -114,6 +123,8 @@ namespace AlibabaCloud
 				void setSecurityGroupName(const std::string& securityGroupName);
 				void setSecurityGroupName(const std::string& securityGroupName);
 				std::string getMachineType()const;
 				std::string getMachineType()const;
 				void setMachineType(const std::string& machineType);
 				void setMachineType(const std::string& machineType);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::vector<HostComponentInfo> getHostComponentInfo()const;
 				std::vector<HostComponentInfo> getHostComponentInfo()const;
 				void setHostComponentInfo(const std::vector<HostComponentInfo>& hostComponentInfo);
 				void setHostComponentInfo(const std::vector<HostComponentInfo>& hostComponentInfo);
 				std::string getClickHouseConf()const;
 				std::string getClickHouseConf()const;
@@ -138,6 +149,8 @@ namespace AlibabaCloud
 				void setVSwitchId(const std::string& vSwitchId);
 				void setVSwitchId(const std::string& vSwitchId);
 				std::string getClusterType()const;
 				std::string getClusterType()const;
 				void setClusterType(const std::string& clusterType);
 				void setClusterType(const std::string& clusterType);
+				std::string getExtraAttributes()const;
+				void setExtraAttributes(const std::string& extraAttributes);
 				bool getAutoRenew()const;
 				bool getAutoRenew()const;
 				void setAutoRenew(bool autoRenew);
 				void setAutoRenew(bool autoRenew);
 				std::vector<std::string> getOptionSoftWareList()const;
 				std::vector<std::string> getOptionSoftWareList()const;
@@ -176,6 +189,8 @@ namespace AlibabaCloud
 				void setRelatedClusterId(const std::string& relatedClusterId);
 				void setRelatedClusterId(const std::string& relatedClusterId);
 				std::string getVpcId()const;
 				std::string getVpcId()const;
 				void setVpcId(const std::string& vpcId);
 				void setVpcId(const std::string& vpcId);
+				std::vector<PromotionInfo> getPromotionInfo()const;
+				void setPromotionInfo(const std::vector<PromotionInfo>& promotionInfo);
 				std::vector<HostGroup> getHostGroup()const;
 				std::vector<HostGroup> getHostGroup()const;
 				void setHostGroup(const std::vector<HostGroup>& hostGroup);
 				void setHostGroup(const std::vector<HostGroup>& hostGroup);
 				std::string getChargeType()const;
 				std::string getChargeType()const;
@@ -198,6 +213,7 @@ namespace AlibabaCloud
 				std::string metaStoreType_;
 				std::string metaStoreType_;
 				std::string securityGroupName_;
 				std::string securityGroupName_;
 				std::string machineType_;
 				std::string machineType_;
+				std::string resourceGroupId_;
 				std::vector<HostComponentInfo> hostComponentInfo_;
 				std::vector<HostComponentInfo> hostComponentInfo_;
 				std::string clickHouseConf_;
 				std::string clickHouseConf_;
 				std::vector<BootstrapAction> bootstrapAction_;
 				std::vector<BootstrapAction> bootstrapAction_;
@@ -210,6 +226,7 @@ namespace AlibabaCloud
 				std::string instanceGeneration_;
 				std::string instanceGeneration_;
 				std::string vSwitchId_;
 				std::string vSwitchId_;
 				std::string clusterType_;
 				std::string clusterType_;
+				std::string extraAttributes_;
 				bool autoRenew_;
 				bool autoRenew_;
 				std::vector<std::string> optionSoftWareList_;
 				std::vector<std::string> optionSoftWareList_;
 				std::string netType_;
 				std::string netType_;
@@ -229,6 +246,7 @@ namespace AlibabaCloud
 				std::string whiteListType_;
 				std::string whiteListType_;
 				std::string relatedClusterId_;
 				std::string relatedClusterId_;
 				std::string vpcId_;
 				std::string vpcId_;
+				std::vector<PromotionInfo> promotionInfo_;
 				std::vector<HostGroup> hostGroup_;
 				std::vector<HostGroup> hostGroup_;
 				std::string chargeType_;
 				std::string chargeType_;
 				std::vector<ServiceInfo> serviceInfo_;
 				std::vector<ServiceInfo> serviceInfo_;

+ 0 - 113
emr/include/alibabacloud/emr/model/CreateClusterWithHostPoolRequest.h

@@ -1,113 +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_EMR_MODEL_CREATECLUSTERWITHHOSTPOOLREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERWITHHOSTPOOLREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateClusterWithHostPoolRequest : public RpcServiceRequest
-			{
-				struct HostInfo
-				{
-					std::string hpHostBizId;
-					std::string hostName;
-					std::string role;
-					long groupId;
-					std::string privateIp;
-					RepeatList serviceComponentInfo;
-					std::string hostGroupName;
-				};
-				struct HostGroup
-				{
-					std::string groupType;
-					long groupId;
-					std::string groupName;
-				};
-				struct ServiceInfo
-				{
-					std::string serviceEcmVersion;
-					std::string serviceVersion;
-					std::string serviceName;
-				};
-				struct Config
-				{
-					std::string configKey;
-					std::string fileName;
-					std::string configValue;
-					std::string serviceName;
-				};
-
-			public:
-				CreateClusterWithHostPoolRequest();
-				~CreateClusterWithHostPoolRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getClusterName()const;
-				void setClusterName(const std::string& clusterName);
-				bool getEasEnable()const;
-				void setEasEnable(bool easEnable);
-				std::vector<HostInfo> getHostInfo()const;
-				void setHostInfo(const std::vector<HostInfo>& hostInfo);
-				std::string getRelatedClusterId()const;
-				void setRelatedClusterId(const std::string& relatedClusterId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getClusterType()const;
-				void setClusterType(const std::string& clusterType);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::vector<HostGroup> getHostGroup()const;
-				void setHostGroup(const std::vector<HostGroup>& hostGroup);
-				std::string getStackName()const;
-				void setStackName(const std::string& stackName);
-				std::string getStackVersion()const;
-				void setStackVersion(const std::string& stackVersion);
-				std::vector<ServiceInfo> getServiceInfo()const;
-				void setServiceInfo(const std::vector<ServiceInfo>& serviceInfo);
-				std::vector<Config> getConfig()const;
-				void setConfig(const std::vector<Config>& config);
-
-            private:
-				long resourceOwnerId_;
-				std::string clusterName_;
-				bool easEnable_;
-				std::vector<HostInfo> hostInfo_;
-				std::string relatedClusterId_;
-				std::string accessKeyId_;
-				std::string clusterType_;
-				std::string regionId_;
-				std::vector<HostGroup> hostGroup_;
-				std::string stackName_;
-				std::string stackVersion_;
-				std::vector<ServiceInfo> serviceInfo_;
-				std::vector<Config> config_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERWITHHOSTPOOLREQUEST_H_

+ 0 - 55
emr/include/alibabacloud/emr/model/CreateClusterWithHostPoolResult.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_EMR_MODEL_CREATECLUSTERWITHHOSTPOOLRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATECLUSTERWITHHOSTPOOLRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateClusterWithHostPoolResult : public ServiceResult
-			{
-			public:
-
-
-				CreateClusterWithHostPoolResult();
-				explicit CreateClusterWithHostPoolResult(const std::string &payload);
-				~CreateClusterWithHostPoolResult();
-				std::string getWorkFlowInstanceId()const;
-				std::string getClusterId()const;
-				std::string getOperationId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string workFlowInstanceId_;
-				std::string clusterId_;
-				std::string operationId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATECLUSTERWITHHOSTPOOLRESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateClusterWithTemplateRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setClusterName(const std::string& clusterName);
 				void setClusterName(const std::string& clusterName);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getTemplateBizId()const;
 				std::string getTemplateBizId()const;
 				void setTemplateBizId(const std::string& templateBizId);
 				void setTemplateBizId(const std::string& templateBizId);
 
 
@@ -51,6 +53,7 @@ namespace AlibabaCloud
 				std::string uniqueTag_;
 				std::string uniqueTag_;
 				std::string clusterName_;
 				std::string clusterName_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string templateBizId_;
 				std::string templateBizId_;
 
 
 			};
 			};

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateDataSourceRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setClusterId(const std::string& clusterId);
 				void setClusterId(const std::string& clusterId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getName()const;
 				std::string getName()const;
@@ -61,6 +63,7 @@ namespace AlibabaCloud
 				std::string conf_;
 				std::string conf_;
 				std::string clusterId_;
 				std::string clusterId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string name_;
 				std::string name_;
 				std::string sourceType_;
 				std::string sourceType_;

+ 0 - 72
emr/include/alibabacloud/emr/model/CreateETLJobRequest.h

@@ -1,72 +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_EMR_MODEL_CREATEETLJOBREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEETLJOBREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateETLJobRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateETLJobRequest();
-				~CreateETLJobRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getNavParentId()const;
-				void setNavParentId(const std::string& navParentId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getType()const;
-				void setType(const std::string& type);
-				std::string getProjectId()const;
-				void setProjectId(const std::string& projectId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string navParentId_;
-				std::string name_;
-				std::string description_;
-				std::string clusterId_;
-				std::string type_;
-				std::string projectId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEETLJOBREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CreateETLJobResult.h

@@ -1,51 +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_EMR_MODEL_CREATEETLJOBRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEETLJOBRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateETLJobResult : public ServiceResult
-			{
-			public:
-
-
-				CreateETLJobResult();
-				explicit CreateETLJobResult(const std::string &payload);
-				~CreateETLJobResult();
-				std::string getId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string id_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEETLJOBRESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateExecutionPlanRequest.h

@@ -34,8 +34,11 @@ namespace AlibabaCloud
 				struct BootstrapAction
 				struct BootstrapAction
 				{
 				{
 					std::string path;
 					std::string path;
+					std::string executionTarget;
+					std::string executionMoment;
 					std::string arg;
 					std::string arg;
 					std::string name;
 					std::string name;
+					std::string executionFailStrategy;
 				};
 				};
 				struct EcsOrder
 				struct EcsOrder
 				{
 				{

+ 9 - 0
emr/include/alibabacloud/emr/model/CreateFlowForWebRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setDescription(const std::string& description);
 				void setDescription(const std::string& description);
 				std::string getAlertUserGroupBizId()const;
 				std::string getAlertUserGroupBizId()const;
 				void setAlertUserGroupBizId(const std::string& alertUserGroupBizId);
 				void setAlertUserGroupBizId(const std::string& alertUserGroupBizId);
+				std::string getLifecycle()const;
+				void setLifecycle(const std::string& lifecycle);
 				std::string getHostName()const;
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				void setHostName(const std::string& hostName);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
@@ -55,6 +57,8 @@ namespace AlibabaCloud
 				void setProjectId(const std::string& projectId);
 				void setProjectId(const std::string& projectId);
 				std::string getParentFlowList()const;
 				std::string getParentFlowList()const;
 				void setParentFlowList(const std::string& parentFlowList);
 				void setParentFlowList(const std::string& parentFlowList);
+				std::string getLogArchiveLocation()const;
+				void setLogArchiveLocation(const std::string& logArchiveLocation);
 				std::string getAlertDingDingGroupBizId()const;
 				std::string getAlertDingDingGroupBizId()const;
 				void setAlertDingDingGroupBizId(const std::string& alertDingDingGroupBizId);
 				void setAlertDingDingGroupBizId(const std::string& alertDingDingGroupBizId);
 				long getStartSchedule()const;
 				long getStartSchedule()const;
@@ -65,6 +69,8 @@ namespace AlibabaCloud
 				void setGraph(const std::string& graph);
 				void setGraph(const std::string& graph);
 				std::string getName()const;
 				std::string getName()const;
 				void setName(const std::string& name);
 				void setName(const std::string& name);
+				std::string get_Namespace()const;
+				void set_Namespace(const std::string& _namespace);
 				std::string getParentCategory()const;
 				std::string getParentCategory()const;
 				void setParentCategory(const std::string& parentCategory);
 				void setParentCategory(const std::string& parentCategory);
 
 
@@ -72,6 +78,7 @@ namespace AlibabaCloud
 				std::string cronExpr_;
 				std::string cronExpr_;
 				std::string description_;
 				std::string description_;
 				std::string alertUserGroupBizId_;
 				std::string alertUserGroupBizId_;
+				std::string lifecycle_;
 				std::string hostName_;
 				std::string hostName_;
 				std::string regionId_;
 				std::string regionId_;
 				bool createCluster_;
 				bool createCluster_;
@@ -79,11 +86,13 @@ namespace AlibabaCloud
 				std::string alertConf_;
 				std::string alertConf_;
 				std::string projectId_;
 				std::string projectId_;
 				std::string parentFlowList_;
 				std::string parentFlowList_;
+				std::string logArchiveLocation_;
 				std::string alertDingDingGroupBizId_;
 				std::string alertDingDingGroupBizId_;
 				long startSchedule_;
 				long startSchedule_;
 				std::string clusterId_;
 				std::string clusterId_;
 				std::string graph_;
 				std::string graph_;
 				std::string name_;
 				std::string name_;
+				std::string _namespace_;
 				std::string parentCategory_;
 				std::string parentCategory_;
 
 
 			};
 			};

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateFlowJobRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				CreateFlowJobRequest();
 				CreateFlowJobRequest();
 				~CreateFlowJobRequest();
 				~CreateFlowJobRequest();
 
 
+				std::string getRetryPolicy()const;
+				void setRetryPolicy(const std::string& retryPolicy);
 				std::string getRunConf()const;
 				std::string getRunConf()const;
 				void setRunConf(const std::string& runConf);
 				void setRunConf(const std::string& runConf);
 				std::string getDescription()const;
 				std::string getDescription()const;
@@ -85,6 +87,7 @@ namespace AlibabaCloud
 				void setParentCategory(const std::string& parentCategory);
 				void setParentCategory(const std::string& parentCategory);
 
 
             private:
             private:
+				std::string retryPolicy_;
 				std::string runConf_;
 				std::string runConf_;
 				std::string description_;
 				std::string description_;
 				std::string type_;
 				std::string type_;

+ 6 - 0
emr/include/alibabacloud/emr/model/CreateFlowProjectRequest.h

@@ -37,6 +37,10 @@ namespace AlibabaCloud
 
 
 				std::string getDescription()const;
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				void setDescription(const std::string& description);
+				std::string getProductType()const;
+				void setProductType(const std::string& productType);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getName()const;
 				std::string getName()const;
@@ -44,6 +48,8 @@ namespace AlibabaCloud
 
 
             private:
             private:
 				std::string description_;
 				std::string description_;
+				std::string productType_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string name_;
 				std::string name_;
 
 

+ 9 - 0
emr/include/alibabacloud/emr/model/CreateFlowRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setDescription(const std::string& description);
 				void setDescription(const std::string& description);
 				std::string getAlertUserGroupBizId()const;
 				std::string getAlertUserGroupBizId()const;
 				void setAlertUserGroupBizId(const std::string& alertUserGroupBizId);
 				void setAlertUserGroupBizId(const std::string& alertUserGroupBizId);
+				std::string getLifecycle()const;
+				void setLifecycle(const std::string& lifecycle);
 				std::string getHostName()const;
 				std::string getHostName()const;
 				void setHostName(const std::string& hostName);
 				void setHostName(const std::string& hostName);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
@@ -55,6 +57,8 @@ namespace AlibabaCloud
 				void setProjectId(const std::string& projectId);
 				void setProjectId(const std::string& projectId);
 				std::string getParentFlowList()const;
 				std::string getParentFlowList()const;
 				void setParentFlowList(const std::string& parentFlowList);
 				void setParentFlowList(const std::string& parentFlowList);
+				std::string getLogArchiveLocation()const;
+				void setLogArchiveLocation(const std::string& logArchiveLocation);
 				std::string getAlertDingDingGroupBizId()const;
 				std::string getAlertDingDingGroupBizId()const;
 				void setAlertDingDingGroupBizId(const std::string& alertDingDingGroupBizId);
 				void setAlertDingDingGroupBizId(const std::string& alertDingDingGroupBizId);
 				long getStartSchedule()const;
 				long getStartSchedule()const;
@@ -65,6 +69,8 @@ namespace AlibabaCloud
 				void setApplication(const std::string& application);
 				void setApplication(const std::string& application);
 				std::string getName()const;
 				std::string getName()const;
 				void setName(const std::string& name);
 				void setName(const std::string& name);
+				std::string get_Namespace()const;
+				void set_Namespace(const std::string& _namespace);
 				std::string getParentCategory()const;
 				std::string getParentCategory()const;
 				void setParentCategory(const std::string& parentCategory);
 				void setParentCategory(const std::string& parentCategory);
 
 
@@ -72,6 +78,7 @@ namespace AlibabaCloud
 				std::string cronExpr_;
 				std::string cronExpr_;
 				std::string description_;
 				std::string description_;
 				std::string alertUserGroupBizId_;
 				std::string alertUserGroupBizId_;
+				std::string lifecycle_;
 				std::string hostName_;
 				std::string hostName_;
 				std::string regionId_;
 				std::string regionId_;
 				bool createCluster_;
 				bool createCluster_;
@@ -79,11 +86,13 @@ namespace AlibabaCloud
 				std::string alertConf_;
 				std::string alertConf_;
 				std::string projectId_;
 				std::string projectId_;
 				std::string parentFlowList_;
 				std::string parentFlowList_;
+				std::string logArchiveLocation_;
 				std::string alertDingDingGroupBizId_;
 				std::string alertDingDingGroupBizId_;
 				long startSchedule_;
 				long startSchedule_;
 				std::string clusterId_;
 				std::string clusterId_;
 				std::string application_;
 				std::string application_;
 				std::string name_;
 				std::string name_;
+				std::string _namespace_;
 				std::string parentCategory_;
 				std::string parentCategory_;
 
 
 			};
 			};

+ 0 - 73
emr/include/alibabacloud/emr/model/CreateHostPoolRequest.h

@@ -1,73 +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_EMR_MODEL_CREATEHOSTPOOLREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEHOSTPOOLREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateHostPoolRequest : public RpcServiceRequest
-			{
-				struct KubeClusterInfo
-				{
-					std::string externalKey;
-					std::string internalConfig;
-					std::string publicConfig;
-					std::string sshConfig;
-				};
-
-			public:
-				CreateHostPoolRequest();
-				~CreateHostPoolRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::vector<KubeClusterInfo> getKubeClusterInfo()const;
-				void setKubeClusterInfo(const std::vector<KubeClusterInfo>& kubeClusterInfo);
-				std::string getType()const;
-				void setType(const std::string& type);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string name_;
-				std::string description_;
-				std::vector<KubeClusterInfo> kubeClusterInfo_;
-				std::string type_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEHOSTPOOLREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CreateHostPoolResult.h

@@ -1,51 +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_EMR_MODEL_CREATEHOSTPOOLRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEHOSTPOOLRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateHostPoolResult : public ServiceResult
-			{
-			public:
-
-
-				CreateHostPoolResult();
-				explicit CreateHostPoolResult(const std::string &payload);
-				~CreateHostPoolResult();
-				std::string getBizId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string bizId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEHOSTPOOLRESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateJobRequest.h

@@ -47,6 +47,8 @@ namespace AlibabaCloud
 				void setRunParameter(const std::string& runParameter);
 				void setRunParameter(const std::string& runParameter);
 				int getRetryInterval()const;
 				int getRetryInterval()const;
 				void setRetryInterval(int retryInterval);
 				void setRetryInterval(int retryInterval);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getName()const;
 				std::string getName()const;
@@ -61,6 +63,7 @@ namespace AlibabaCloud
 				std::string failAct_;
 				std::string failAct_;
 				std::string runParameter_;
 				std::string runParameter_;
 				int retryInterval_;
 				int retryInterval_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string name_;
 				std::string name_;
 				int maxRetry_;
 				int maxRetry_;

+ 27 - 24
emr/include/alibabacloud/emr/model/CreateNavNodeRequest.h → emr/include/alibabacloud/emr/model/CreateLibraryRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_CREATENAVNODEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATENAVNODEREQUEST_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_CREATELIBRARYREQUEST_H_
+#define ALIBABACLOUD_EMR_MODEL_CREATELIBRARYREQUEST_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -28,45 +28,48 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT CreateNavNodeRequest : public RpcServiceRequest
+			class ALIBABACLOUD_EMR_EXPORT CreateLibraryRequest : public RpcServiceRequest
 			{
 			{
 
 
 			public:
 			public:
-				CreateNavNodeRequest();
-				~CreateNavNodeRequest();
+				CreateLibraryRequest();
+				~CreateLibraryRequest();
 
 
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
+				std::string getLibraryVersion()const;
+				void setLibraryVersion(const std::string& libraryVersion);
 				std::string getType()const;
 				std::string getType()const;
 				void setType(const std::string& type);
 				void setType(const std::string& type);
-				std::string getProjectId()const;
-				void setProjectId(const std::string& projectId);
-				std::string getCategoryType()const;
-				void setCategoryType(const std::string& categoryType);
-				std::string getObjectId()const;
-				void setObjectId(const std::string& objectId);
-				std::string getParentId()const;
-				void setParentId(const std::string& parentId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getScope()const;
+				void setScope(const std::string& scope);
+				std::string getName()const;
+				void setName(const std::string& name);
+				std::string getSourceType()const;
+				void setSourceType(const std::string& sourceType);
+				std::string getProperties()const;
+				void setProperties(const std::string& properties);
+				std::string getSourceLocation()const;
+				void setSourceLocation(const std::string& sourceLocation);
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
-				std::string regionId_;
-				std::string name_;
+				std::string libraryVersion_;
 				std::string type_;
 				std::string type_;
-				std::string projectId_;
-				std::string categoryType_;
-				std::string objectId_;
-				std::string parentId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string regionId_;
+				std::string scope_;
+				std::string name_;
+				std::string sourceType_;
+				std::string properties_;
+				std::string sourceLocation_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATENAVNODEREQUEST_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_CREATELIBRARYREQUEST_H_

+ 7 - 7
emr/include/alibabacloud/emr/model/ListNavSubTreeResult.h → emr/include/alibabacloud/emr/model/CreateLibraryResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_LISTNAVSUBTREERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_LISTNAVSUBTREERESULT_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_CREATELIBRARYRESULT_H_
+#define ALIBABACLOUD_EMR_MODEL_CREATELIBRARYRESULT_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT ListNavSubTreeResult : public ServiceResult
+			class ALIBABACLOUD_EMR_EXPORT CreateLibraryResult : public ServiceResult
 			{
 			{
 			public:
 			public:
 
 
 
 
-				ListNavSubTreeResult();
-				explicit ListNavSubTreeResult(const std::string &payload);
-				~ListNavSubTreeResult();
+				CreateLibraryResult();
+				explicit CreateLibraryResult(const std::string &payload);
+				~CreateLibraryResult();
 				std::string getData()const;
 				std::string getData()const;
 
 
 			protected:
 			protected:
@@ -48,4 +48,4 @@ namespace AlibabaCloud
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_LISTNAVSUBTREERESULT_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_CREATELIBRARYRESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateMetaTablePreviewTaskRequest.h

@@ -41,6 +41,8 @@ namespace AlibabaCloud
 				void setClusterId(const std::string& clusterId);
 				void setClusterId(const std::string& clusterId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getPassword()const;
 				std::string getPassword()const;
 				void setPassword(const std::string& password);
 				void setPassword(const std::string& password);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
@@ -56,6 +58,7 @@ namespace AlibabaCloud
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string clusterId_;
 				std::string clusterId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string password_;
 				std::string password_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string tableId_;
 				std::string tableId_;

+ 0 - 51
emr/include/alibabacloud/emr/model/CreateNavNodeResult.h

@@ -1,51 +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_EMR_MODEL_CREATENAVNODERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATENAVNODERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateNavNodeResult : public ServiceResult
-			{
-			public:
-
-
-				CreateNavNodeResult();
-				explicit CreateNavNodeResult(const std::string &payload);
-				~CreateNavNodeResult();
-				std::string getId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string id_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATENAVNODERESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/CreateNoteRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setType(const std::string& type);
 				void setType(const std::string& type);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getName()const;
 				std::string getName()const;
@@ -53,6 +55,7 @@ namespace AlibabaCloud
 				std::string clusterId_;
 				std::string clusterId_;
 				std::string type_;
 				std::string type_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string name_;
 				std::string name_;
 
 

+ 12 - 12
emr/include/alibabacloud/emr/model/ModifyAlertUserGroupRequest.h → emr/include/alibabacloud/emr/model/CreateScalingGroupV2Request.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_MODIFYALERTUSERGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_MODIFYALERTUSERGROUPREQUEST_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_CREATESCALINGGROUPV2REQUEST_H_
+#define ALIBABACLOUD_EMR_MODEL_CREATESCALINGGROUPV2REQUEST_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -28,39 +28,39 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT ModifyAlertUserGroupRequest : public RpcServiceRequest
+			class ALIBABACLOUD_EMR_EXPORT CreateScalingGroupV2Request : public RpcServiceRequest
 			{
 			{
 
 
 			public:
 			public:
-				ModifyAlertUserGroupRequest();
-				~ModifyAlertUserGroupRequest();
+				CreateScalingGroupV2Request();
+				~CreateScalingGroupV2Request();
 
 
-				std::string getUserList()const;
-				void setUserList(const std::string& userList);
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getDescription()const;
 				std::string getDescription()const;
 				void setDescription(const std::string& description);
 				void setDescription(const std::string& description);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
-				std::string getBizId()const;
-				void setBizId(const std::string& bizId);
+				std::string getHostGroupId()const;
+				void setHostGroupId(const std::string& hostGroupId);
 				std::string getName()const;
 				std::string getName()const;
 				void setName(const std::string& name);
 				void setName(const std::string& name);
 
 
             private:
             private:
-				std::string userList_;
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string description_;
 				std::string description_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
-				std::string bizId_;
+				std::string hostGroupId_;
 				std::string name_;
 				std::string name_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_MODIFYALERTUSERGROUPREQUEST_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_CREATESCALINGGROUPV2REQUEST_H_

+ 9 - 9
emr/include/alibabacloud/emr/model/CreateAlertUserGroupResult.h → emr/include/alibabacloud/emr/model/CreateScalingGroupV2Result.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_CREATEALERTUSERGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEALERTUSERGROUPRESULT_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_CREATESCALINGGROUPV2RESULT_H_
+#define ALIBABACLOUD_EMR_MODEL_CREATESCALINGGROUPV2RESULT_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -29,23 +29,23 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT CreateAlertUserGroupResult : public ServiceResult
+			class ALIBABACLOUD_EMR_EXPORT CreateScalingGroupV2Result : public ServiceResult
 			{
 			{
 			public:
 			public:
 
 
 
 
-				CreateAlertUserGroupResult();
-				explicit CreateAlertUserGroupResult(const std::string &payload);
-				~CreateAlertUserGroupResult();
-				long getId()const;
+				CreateScalingGroupV2Result();
+				explicit CreateScalingGroupV2Result(const std::string &payload);
+				~CreateScalingGroupV2Result();
+				std::string getData()const;
 
 
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
-				long id_;
+				std::string data_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEALERTUSERGROUPRESULT_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_CREATESCALINGGROUPV2RESULT_H_

+ 6 - 0
emr/include/alibabacloud/emr/model/CreateScalingRuleRequest.h

@@ -63,12 +63,16 @@ namespace AlibabaCloud
 				void setCloudWatchTrigger(const std::vector<CloudWatchTrigger>& cloudWatchTrigger);
 				void setCloudWatchTrigger(const std::vector<CloudWatchTrigger>& cloudWatchTrigger);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				long getTimeoutWithGrace()const;
+				void setTimeoutWithGrace(long timeoutWithGrace);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				int getCooldown()const;
 				int getCooldown()const;
 				void setCooldown(int cooldown);
 				void setCooldown(int cooldown);
 				std::string getLaunchTime()const;
 				std::string getLaunchTime()const;
 				void setLaunchTime(const std::string& launchTime);
 				void setLaunchTime(const std::string& launchTime);
+				bool getWithGrace()const;
+				void setWithGrace(bool withGrace);
 				std::string getRuleCategory()const;
 				std::string getRuleCategory()const;
 				void setRuleCategory(const std::string& ruleCategory);
 				void setRuleCategory(const std::string& ruleCategory);
 				int getAdjustmentValue()const;
 				int getAdjustmentValue()const;
@@ -94,9 +98,11 @@ namespace AlibabaCloud
 				std::string recurrenceEndTime_;
 				std::string recurrenceEndTime_;
 				std::vector<CloudWatchTrigger> cloudWatchTrigger_;
 				std::vector<CloudWatchTrigger> cloudWatchTrigger_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				long timeoutWithGrace_;
 				std::string regionId_;
 				std::string regionId_;
 				int cooldown_;
 				int cooldown_;
 				std::string launchTime_;
 				std::string launchTime_;
+				bool withGrace_;
 				std::string ruleCategory_;
 				std::string ruleCategory_;
 				int adjustmentValue_;
 				int adjustmentValue_;
 				std::string adjustmentType_;
 				std::string adjustmentType_;

+ 0 - 113
emr/include/alibabacloud/emr/model/CreateScalingTaskGroupRequest.h

@@ -1,113 +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_EMR_MODEL_CREATESCALINGTASKGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATESCALINGTASKGROUPREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateScalingTaskGroupRequest : public RpcServiceRequest
-			{
-				struct SpotPriceLimits
-				{
-					std::string instanceType;
-					float priceLimit;
-				};
-				struct ScalingRule
-				{
-					std::string launchTime;
-					std::string ruleCategory;
-					int adjustmentValue;
-					RepeatList schedulerTrigger;
-					std::string adjustmentType;
-					int cooldown;
-					std::string ruleName;
-					int launchExpirationTime;
-					std::string recurrenceValue;
-					std::string recurrenceEndTime;
-					RepeatList cloudWatchTrigger;
-					std::string recurrenceType;
-				};
-
-			public:
-				CreateScalingTaskGroupRequest();
-				~CreateScalingTaskGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getDataDiskCategory()const;
-				void setDataDiskCategory(const std::string& dataDiskCategory);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				int getMinSize()const;
-				void setMinSize(int minSize);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getSpotStrategy()const;
-				void setSpotStrategy(const std::string& spotStrategy);
-				int getDataDiskSize()const;
-				void setDataDiskSize(int dataDiskSize);
-				std::vector<SpotPriceLimits> getSpotPriceLimits()const;
-				void setSpotPriceLimits(const std::vector<SpotPriceLimits>& spotPriceLimits);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::vector<ScalingRule> getScalingRule()const;
-				void setScalingRule(const std::vector<ScalingRule>& scalingRule);
-				std::string getActiveRuleCategory()const;
-				void setActiveRuleCategory(const std::string& activeRuleCategory);
-				int getMaxSize()const;
-				void setMaxSize(int maxSize);
-				int getDataDiskCount()const;
-				void setDataDiskCount(int dataDiskCount);
-				int getDefaultCooldown()const;
-				void setDefaultCooldown(int defaultCooldown);
-				std::string getPayType()const;
-				void setPayType(const std::string& payType);
-				std::vector<std::string> getInstanceTypeList()const;
-				void setInstanceTypeList(const std::vector<std::string>& instanceTypeList);
-
-            private:
-				long resourceOwnerId_;
-				std::string dataDiskCategory_;
-				std::string clusterId_;
-				int minSize_;
-				std::string accessKeyId_;
-				std::string spotStrategy_;
-				int dataDiskSize_;
-				std::vector<SpotPriceLimits> spotPriceLimits_;
-				std::string regionId_;
-				std::vector<ScalingRule> scalingRule_;
-				std::string activeRuleCategory_;
-				int maxSize_;
-				int dataDiskCount_;
-				int defaultCooldown_;
-				std::string payType_;
-				std::vector<std::string> instanceTypeList_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATESCALINGTASKGROUPREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/CreateScalingTaskGroupResult.h

@@ -1,51 +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_EMR_MODEL_CREATESCALINGTASKGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATESCALINGTASKGROUPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateScalingTaskGroupResult : public ServiceResult
-			{
-			public:
-
-
-				CreateScalingTaskGroupResult();
-				explicit CreateScalingTaskGroupResult(const std::string &payload);
-				~CreateScalingTaskGroupResult();
-				std::string getHostGroupId()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string hostGroupId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATESCALINGTASKGROUPRESULT_H_

+ 0 - 66
emr/include/alibabacloud/emr/model/CreateUserGroupRequest.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_EMR_MODEL_CREATEUSERGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEUSERGROUPREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateUserGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateUserGroupRequest();
-				~CreateUserGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getDescription()const;
-				void setDescription(const std::string& description);
-				std::string getType()const;
-				void setType(const std::string& type);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getName()const;
-				void setName(const std::string& name);
-				std::vector<long> getRoleIdList()const;
-				void setRoleIdList(const std::vector<long>& roleIdList);
-
-            private:
-				long resourceOwnerId_;
-				std::string description_;
-				std::string type_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string name_;
-				std::vector<long> roleIdList_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEUSERGROUPREQUEST_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/CreateUserGroupResult.h

@@ -1,53 +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_EMR_MODEL_CREATEUSERGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEUSERGROUPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateUserGroupResult : public ServiceResult
-			{
-			public:
-
-
-				CreateUserGroupResult();
-				explicit CreateUserGroupResult(const std::string &payload);
-				~CreateUserGroupResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEUSERGROUPRESULT_H_

+ 0 - 70
emr/include/alibabacloud/emr/model/CreateUserPasswordRequest.h

@@ -1,70 +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_EMR_MODEL_CREATEUSERPASSWORDREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEUSERPASSWORDREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateUserPasswordRequest : public RpcServiceRequest
-			{
-				struct UserInfo
-				{
-					std::string type;
-					std::string groupName;
-					std::string userId;
-					std::string userName;
-				};
-
-			public:
-				CreateUserPasswordRequest();
-				~CreateUserPasswordRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getPassword()const;
-				void setPassword(const std::string& password);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::vector<UserInfo> getUserInfo()const;
-				void setUserInfo(const std::vector<UserInfo>& userInfo);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string password_;
-				std::string regionId_;
-				std::string clusterId_;
-				std::vector<UserInfo> userInfo_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEUSERPASSWORDREQUEST_H_

+ 0 - 54
emr/include/alibabacloud/emr/model/CreateUserStatisticsRequest.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_EMR_MODEL_CREATEUSERSTATISTICSREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEUSERSTATISTICSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateUserStatisticsRequest : public RpcServiceRequest
-			{
-
-			public:
-				CreateUserStatisticsRequest();
-				~CreateUserStatisticsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEUSERSTATISTICSREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/CreateUserStatisticsResult.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_EMR_MODEL_CREATEUSERSTATISTICSRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_CREATEUSERSTATISTICSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT CreateUserStatisticsResult : public ServiceResult
-			{
-			public:
-
-
-				CreateUserStatisticsResult();
-				explicit CreateUserStatisticsResult(const std::string &payload);
-				~CreateUserStatisticsResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_CREATEUSERSTATISTICSRESULT_H_

+ 18 - 12
emr/include/alibabacloud/emr/model/ListSlsLogstoreInfoRequest.h → emr/include/alibabacloud/emr/model/DecommissionHostComponentRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_LISTSLSLOGSTOREINFOREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_LISTSLSLOGSTOREINFOREQUEST_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_DECOMMISSIONHOSTCOMPONENTREQUEST_H_
+#define ALIBABACLOUD_EMR_MODEL_DECOMMISSIONHOSTCOMPONENTREQUEST_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -28,36 +28,42 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT ListSlsLogstoreInfoRequest : public RpcServiceRequest
+			class ALIBABACLOUD_EMR_EXPORT DecommissionHostComponentRequest : public RpcServiceRequest
 			{
 			{
 
 
 			public:
 			public:
-				ListSlsLogstoreInfoRequest();
-				~ListSlsLogstoreInfoRequest();
+				DecommissionHostComponentRequest();
+				~DecommissionHostComponentRequest();
 
 
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
+				std::string getHostInstanceId()const;
+				void setHostInstanceId(const std::string& hostInstanceId);
 				std::string getComponentName()const;
 				std::string getComponentName()const;
 				void setComponentName(const std::string& componentName);
 				void setComponentName(const std::string& componentName);
-				std::string getServiceName()const;
-				void setServiceName(const std::string& serviceName);
 				std::string getClusterId()const;
 				std::string getClusterId()const;
 				void setClusterId(const std::string& clusterId);
 				void setClusterId(const std::string& clusterId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				long getTimeoutSeconds()const;
+				void setTimeoutSeconds(long timeoutSeconds);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::string getServiceName()const;
+				void setServiceName(const std::string& serviceName);
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
-				std::string regionId_;
+				std::string hostInstanceId_;
 				std::string componentName_;
 				std::string componentName_;
-				std::string serviceName_;
 				std::string clusterId_;
 				std::string clusterId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				long timeoutSeconds_;
+				std::string regionId_;
+				std::string serviceName_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_LISTSLSLOGSTOREINFOREQUEST_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_DECOMMISSIONHOSTCOMPONENTREQUEST_H_

+ 7 - 7
emr/include/alibabacloud/emr/model/AddClusterServiceForAdminResult.h → emr/include/alibabacloud/emr/model/DecommissionHostComponentResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_ADDCLUSTERSERVICEFORADMINRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_ADDCLUSTERSERVICEFORADMINRESULT_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_DECOMMISSIONHOSTCOMPONENTRESULT_H_
+#define ALIBABACLOUD_EMR_MODEL_DECOMMISSIONHOSTCOMPONENTRESULT_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT AddClusterServiceForAdminResult : public ServiceResult
+			class ALIBABACLOUD_EMR_EXPORT DecommissionHostComponentResult : public ServiceResult
 			{
 			{
 			public:
 			public:
 
 
 
 
-				AddClusterServiceForAdminResult();
-				explicit AddClusterServiceForAdminResult(const std::string &payload);
-				~AddClusterServiceForAdminResult();
+				DecommissionHostComponentResult();
+				explicit DecommissionHostComponentResult(const std::string &payload);
+				~DecommissionHostComponentResult();
 
 
 			protected:
 			protected:
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
@@ -46,4 +46,4 @@ namespace AlibabaCloud
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_ADDCLUSTERSERVICEFORADMINRESULT_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_DECOMMISSIONHOSTCOMPONENTRESULT_H_

+ 0 - 57
emr/include/alibabacloud/emr/model/DeleteAlertContactsRequest.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_EMR_MODEL_DELETEALERTCONTACTSREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEALERTCONTACTSREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteAlertContactsRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteAlertContactsRequest();
-				~DeleteAlertContactsRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getIds()const;
-				void setIds(const std::string& ids);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string ids_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEALERTCONTACTSREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/DeleteAlertContactsResult.h

@@ -1,51 +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_EMR_MODEL_DELETEALERTCONTACTSRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEALERTCONTACTSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteAlertContactsResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteAlertContactsResult();
-				explicit DeleteAlertContactsResult(const std::string &payload);
-				~DeleteAlertContactsResult();
-				bool getDone()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool done_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEALERTCONTACTSRESULT_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/DeleteBatchResourceUsersResult.h

@@ -1,53 +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_EMR_MODEL_DELETEBATCHRESOURCEUSERSRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEBATCHRESOURCEUSERSRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteBatchResourceUsersResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteBatchResourceUsersResult();
-				explicit DeleteBatchResourceUsersResult(const std::string &payload);
-				~DeleteBatchResourceUsersResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEBATCHRESOURCEUSERSRESULT_H_

+ 0 - 57
emr/include/alibabacloud/emr/model/DeleteClusterScriptRequest.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_EMR_MODEL_DELETECLUSTERSCRIPTREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETECLUSTERSCRIPTREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteClusterScriptRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteClusterScriptRequest();
-				~DeleteClusterScriptRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string id_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETECLUSTERSCRIPTREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/DeleteClusterScriptResult.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_EMR_MODEL_DELETECLUSTERSCRIPTRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETECLUSTERSCRIPTRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteClusterScriptResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteClusterScriptResult();
-				explicit DeleteClusterScriptResult(const std::string &payload);
-				~DeleteClusterScriptResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETECLUSTERSCRIPTRESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/DeleteClusterTemplateRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getBizId()const;
 				std::string getBizId()const;
@@ -47,6 +49,7 @@ namespace AlibabaCloud
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string bizId_;
 				std::string bizId_;
 
 

+ 0 - 57
emr/include/alibabacloud/emr/model/DeleteETLJobRequest.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_EMR_MODEL_DELETEETLJOBREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEETLJOBREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteETLJobRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteETLJobRequest();
-				~DeleteETLJobRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string id_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEETLJOBREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/DeleteETLJobResult.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_EMR_MODEL_DELETEETLJOBRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEETLJOBRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteETLJobResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteETLJobResult();
-				explicit DeleteETLJobResult(const std::string &payload);
-				~DeleteETLJobResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEETLJOBRESULT_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/DeleteFlowProjectByIdRequest.h

@@ -1,51 +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_EMR_MODEL_DELETEFLOWPROJECTBYIDREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEFLOWPROJECTBYIDREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteFlowProjectByIdRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteFlowProjectByIdRequest();
-				~DeleteFlowProjectByIdRequest();
-
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getProjectId()const;
-				void setProjectId(const std::string& projectId);
-
-            private:
-				std::string regionId_;
-				std::string projectId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEFLOWPROJECTBYIDREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/DeleteFlowProjectByIdResult.h

@@ -1,51 +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_EMR_MODEL_DELETEFLOWPROJECTBYIDRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEFLOWPROJECTBYIDRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteFlowProjectByIdResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteFlowProjectByIdResult();
-				explicit DeleteFlowProjectByIdResult(const std::string &payload);
-				~DeleteFlowProjectByIdResult();
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEFLOWPROJECTBYIDRESULT_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/DeleteHostPoolResult.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_EMR_MODEL_DELETEHOSTPOOLRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEHOSTPOOLRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteHostPoolResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteHostPoolResult();
-				explicit DeleteHostPoolResult(const std::string &payload);
-				~DeleteHostPoolResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEHOSTPOOLRESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/DeleteJobRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getId()const;
 				std::string getId()const;
@@ -47,6 +49,7 @@ namespace AlibabaCloud
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string id_;
 				std::string id_;
 
 

+ 12 - 12
emr/include/alibabacloud/emr/model/QueryAlarmRulesRequest.h → emr/include/alibabacloud/emr/model/DeleteLibrariesRequest.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_QUERYALARMRULESREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_QUERYALARMRULESREQUEST_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_DELETELIBRARIESREQUEST_H_
+#define ALIBABACLOUD_EMR_MODEL_DELETELIBRARIESREQUEST_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -28,30 +28,30 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT QueryAlarmRulesRequest : public RpcServiceRequest
+			class ALIBABACLOUD_EMR_EXPORT DeleteLibrariesRequest : public RpcServiceRequest
 			{
 			{
 
 
 			public:
 			public:
-				QueryAlarmRulesRequest();
-				~QueryAlarmRulesRequest();
+				DeleteLibrariesRequest();
+				~DeleteLibrariesRequest();
 
 
 				long getResourceOwnerId()const;
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getRegionId()const;
+				void setRegionId(const std::string& regionId);
+				std::vector<std::string> getLibraryBizIdList()const;
+				void setLibraryBizIdList(const std::vector<std::string>& libraryBizIdList);
 
 
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
-				std::string regionId_;
-				std::string clusterId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string regionId_;
+				std::vector<std::string> libraryBizIdList_;
 
 
 			};
 			};
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_QUERYALARMRULESREQUEST_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_DELETELIBRARIESREQUEST_H_

+ 7 - 7
emr/include/alibabacloud/emr/model/KillFlowResult.h → emr/include/alibabacloud/emr/model/DeleteLibrariesResult.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-#ifndef ALIBABACLOUD_EMR_MODEL_KILLFLOWRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_KILLFLOWRESULT_H_
+#ifndef ALIBABACLOUD_EMR_MODEL_DELETELIBRARIESRESULT_H_
+#define ALIBABACLOUD_EMR_MODEL_DELETELIBRARIESRESULT_H_
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -29,14 +29,14 @@ namespace AlibabaCloud
 	{
 	{
 		namespace Model
 		namespace Model
 		{
 		{
-			class ALIBABACLOUD_EMR_EXPORT KillFlowResult : public ServiceResult
+			class ALIBABACLOUD_EMR_EXPORT DeleteLibrariesResult : public ServiceResult
 			{
 			{
 			public:
 			public:
 
 
 
 
-				KillFlowResult();
-				explicit KillFlowResult(const std::string &payload);
-				~KillFlowResult();
+				DeleteLibrariesResult();
+				explicit DeleteLibrariesResult(const std::string &payload);
+				~DeleteLibrariesResult();
 				bool getData()const;
 				bool getData()const;
 
 
 			protected:
 			protected:
@@ -48,4 +48,4 @@ namespace AlibabaCloud
 		}
 		}
 	}
 	}
 }
 }
-#endif // !ALIBABACLOUD_EMR_MODEL_KILLFLOWRESULT_H_
+#endif // !ALIBABACLOUD_EMR_MODEL_DELETELIBRARIESRESULT_H_

+ 0 - 60
emr/include/alibabacloud/emr/model/DeleteNavNodeRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_DELETENAVNODEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETENAVNODEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteNavNodeRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteNavNodeRequest();
-				~DeleteNavNodeRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getProjectId()const;
-				void setProjectId(const std::string& projectId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string id_;
-				std::string projectId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETENAVNODEREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/DeleteNavNodeResult.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_EMR_MODEL_DELETENAVNODERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETENAVNODERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteNavNodeResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteNavNodeResult();
-				explicit DeleteNavNodeResult(const std::string &payload);
-				~DeleteNavNodeResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETENAVNODERESULT_H_

+ 3 - 0
emr/include/alibabacloud/emr/model/DeleteNoteRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getResourceGroupId()const;
+				void setResourceGroupId(const std::string& resourceGroupId);
 				std::string getRegionId()const;
 				std::string getRegionId()const;
 				void setRegionId(const std::string& regionId);
 				void setRegionId(const std::string& regionId);
 				std::string getId()const;
 				std::string getId()const;
@@ -47,6 +49,7 @@ namespace AlibabaCloud
             private:
             private:
 				long resourceOwnerId_;
 				long resourceOwnerId_;
 				std::string accessKeyId_;
 				std::string accessKeyId_;
+				std::string resourceGroupId_;
 				std::string regionId_;
 				std::string regionId_;
 				std::string id_;
 				std::string id_;
 
 

+ 0 - 60
emr/include/alibabacloud/emr/model/DeleteParagraphRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_DELETEPARAGRAPHREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEPARAGRAPHREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteParagraphRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteParagraphRequest();
-				~DeleteParagraphRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getNoteId()const;
-				void setNoteId(const std::string& noteId);
-				std::string getId()const;
-				void setId(const std::string& id);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string noteId_;
-				std::string id_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEPARAGRAPHREQUEST_H_

+ 0 - 49
emr/include/alibabacloud/emr/model/DeleteParagraphResult.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_EMR_MODEL_DELETEPARAGRAPHRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEPARAGRAPHRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteParagraphResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteParagraphResult();
-				explicit DeleteParagraphResult(const std::string &payload);
-				~DeleteParagraphResult();
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEPARAGRAPHRESULT_H_

+ 0 - 63
emr/include/alibabacloud/emr/model/DeleteResourceUserRequest.h

@@ -1,63 +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_EMR_MODEL_DELETERESOURCEUSERREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETERESOURCEUSERREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteResourceUserRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteResourceUserRequest();
-				~DeleteResourceUserRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceId()const;
-				void setResourceId(const std::string& resourceId);
-				std::string getResourceType()const;
-				void setResourceType(const std::string& resourceType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getAliyunUserId()const;
-				void setAliyunUserId(const std::string& aliyunUserId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceId_;
-				std::string resourceType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string aliyunUserId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETERESOURCEUSERREQUEST_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/DeleteResourceUserResult.h

@@ -1,53 +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_EMR_MODEL_DELETERESOURCEUSERRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETERESOURCEUSERRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteResourceUserResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteResourceUserResult();
-				explicit DeleteResourceUserResult(const std::string &payload);
-				~DeleteResourceUserResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETERESOURCEUSERRESULT_H_

+ 0 - 60
emr/include/alibabacloud/emr/model/DeleteScalingTaskGroupRequest.h

@@ -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.
- */
-
-#ifndef ALIBABACLOUD_EMR_MODEL_DELETESCALINGTASKGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETESCALINGTASKGROUPREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteScalingTaskGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteScalingTaskGroupRequest();
-				~DeleteScalingTaskGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getHostGroupId()const;
-				void setHostGroupId(const std::string& hostGroupId);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string hostGroupId_;
-				std::string clusterId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETESCALINGTASKGROUPREQUEST_H_

+ 0 - 51
emr/include/alibabacloud/emr/model/DeleteScalingTaskGroupResult.h

@@ -1,51 +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_EMR_MODEL_DELETESCALINGTASKGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETESCALINGTASKGROUPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteScalingTaskGroupResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteScalingTaskGroupResult();
-				explicit DeleteScalingTaskGroupResult(const std::string &payload);
-				~DeleteScalingTaskGroupResult();
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETESCALINGTASKGROUPRESULT_H_

+ 0 - 57
emr/include/alibabacloud/emr/model/DeleteUserGroupRequest.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_EMR_MODEL_DELETEUSERGROUPREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEUSERGROUPREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteUserGroupRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteUserGroupRequest();
-				~DeleteUserGroupRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				long getGroupId()const;
-				void setGroupId(long groupId);
-
-            private:
-				long resourceOwnerId_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				long groupId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEUSERGROUPREQUEST_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/DeleteUserGroupResult.h

@@ -1,53 +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_EMR_MODEL_DELETEUSERGROUPRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEUSERGROUPRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteUserGroupResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteUserGroupResult();
-				explicit DeleteUserGroupResult(const std::string &payload);
-				~DeleteUserGroupResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEUSERGROUPRESULT_H_

+ 0 - 66
emr/include/alibabacloud/emr/model/DeleteUserResourceRoleRequest.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_EMR_MODEL_DELETEUSERRESOURCEROLEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEUSERRESOURCEROLEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteUserResourceRoleRequest : public RpcServiceRequest
-			{
-
-			public:
-				DeleteUserResourceRoleRequest();
-				~DeleteUserResourceRoleRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getResourceId()const;
-				void setResourceId(const std::string& resourceId);
-				long getRoleId()const;
-				void setRoleId(long roleId);
-				std::string getResourceType()const;
-				void setResourceType(const std::string& resourceType);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getAliyunUserId()const;
-				void setAliyunUserId(const std::string& aliyunUserId);
-
-            private:
-				long resourceOwnerId_;
-				std::string resourceId_;
-				long roleId_;
-				std::string resourceType_;
-				std::string accessKeyId_;
-				std::string regionId_;
-				std::string aliyunUserId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEUSERRESOURCEROLEREQUEST_H_

+ 0 - 53
emr/include/alibabacloud/emr/model/DeleteUserResourceRoleResult.h

@@ -1,53 +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_EMR_MODEL_DELETEUSERRESOURCEROLERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DELETEUSERRESOURCEROLERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DeleteUserResourceRoleResult : public ServiceResult
-			{
-			public:
-
-
-				DeleteUserResourceRoleResult();
-				explicit DeleteUserResourceRoleResult(const std::string &payload);
-				~DeleteUserResourceRoleResult();
-				bool getPaging()const;
-				bool getData()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				bool paging_;
-				bool data_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DELETEUSERRESOURCEROLERESULT_H_

+ 0 - 57
emr/include/alibabacloud/emr/model/DescribeAvailableInstanceTypeRequest.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_EMR_MODEL_DESCRIBEAVAILABLEINSTANCETYPEREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DESCRIBEAVAILABLEINSTANCETYPEREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DescribeAvailableInstanceTypeRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeAvailableInstanceTypeRequest();
-				~DescribeAvailableInstanceTypeRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				std::string getClusterId()const;
-				void setClusterId(const std::string& clusterId);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				std::string clusterId_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DESCRIBEAVAILABLEINSTANCETYPEREQUEST_H_

+ 0 - 61
emr/include/alibabacloud/emr/model/DescribeAvailableInstanceTypeResult.h

@@ -1,61 +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_EMR_MODEL_DESCRIBEAVAILABLEINSTANCETYPERESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DESCRIBEAVAILABLEINSTANCETYPERESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DescribeAvailableInstanceTypeResult : public ServiceResult
-			{
-			public:
-				struct EmrSupportInstanceType
-				{
-					struct ClusterNodeTypeSupportInfo
-					{
-						std::vector<std::string> supportInstanceTypeList;
-						std::string clusterNodeType;
-					};
-					std::vector<EmrSupportInstanceType::ClusterNodeTypeSupportInfo> nodeTypeSupportInfoList;
-					std::string clusterType;
-				};
-
-
-				DescribeAvailableInstanceTypeResult();
-				explicit DescribeAvailableInstanceTypeResult(const std::string &payload);
-				~DescribeAvailableInstanceTypeResult();
-				std::vector<EmrSupportInstanceType> getEmrSupportedInstanceTypeList()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::vector<EmrSupportInstanceType> emrSupportedInstanceTypeList_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DESCRIBEAVAILABLEINSTANCETYPERESULT_H_

+ 5 - 0
emr/include/alibabacloud/emr/model/DescribeClusterBasicInfoResult.h

@@ -93,8 +93,10 @@ namespace AlibabaCloud
 					std::vector<BootstrapAction> bootstrapActionList;
 					std::vector<BootstrapAction> bootstrapActionList;
 					bool resizeDiskEnable;
 					bool resizeDiskEnable;
 					FailReason failReason;
 					FailReason failReason;
+					std::string k8sClusterId;
 					std::string name;
 					std::string name;
 					bool highAvailabilityEnable;
 					bool highAvailabilityEnable;
+					std::string autoScalingVersion;
 					long expiredTime;
 					long expiredTime;
 					std::string createType;
 					std::string createType;
 					std::string imageId;
 					std::string imageId;
@@ -120,6 +122,7 @@ namespace AlibabaCloud
 					RelateClusterInfo relateClusterInfo;
 					RelateClusterInfo relateClusterInfo;
 					std::string relateClusterId;
 					std::string relateClusterId;
 					bool autoScalingByLoadAllowed;
 					bool autoScalingByLoadAllowed;
+					bool autoScalingWithGraceAllowed;
 					int coreNodeTotal;
 					int coreNodeTotal;
 					std::string configurations;
 					std::string configurations;
 					std::string netType;
 					std::string netType;
@@ -128,10 +131,12 @@ namespace AlibabaCloud
 					bool ioOptimized;
 					bool ioOptimized;
 					std::string zoneId;
 					std::string zoneId;
 					std::string clusterId;
 					std::string clusterId;
+					std::string operationId;
 					std::string securityGroupId;
 					std::string securityGroupId;
 					std::string machineType;
 					std::string machineType;
 					int taskNodeTotal;
 					int taskNodeTotal;
 					AccessInfo accessInfo;
 					AccessInfo accessInfo;
+					std::string extraInfo;
 					int masterNodeTotal;
 					int masterNodeTotal;
 					std::string userId;
 					std::string userId;
 					std::string chargeType;
 					std::string chargeType;

+ 0 - 63
emr/include/alibabacloud/emr/model/DescribeClusterOpLogRequest.h

@@ -1,63 +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_EMR_MODEL_DESCRIBECLUSTEROPLOGREQUEST_H_
-#define ALIBABACLOUD_EMR_MODEL_DESCRIBECLUSTEROPLOGREQUEST_H_
-
-#include <string>
-#include <vector>
-#include <alibabacloud/core/RpcServiceRequest.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DescribeClusterOpLogRequest : public RpcServiceRequest
-			{
-
-			public:
-				DescribeClusterOpLogRequest();
-				~DescribeClusterOpLogRequest();
-
-				long getResourceOwnerId()const;
-				void setResourceOwnerId(long resourceOwnerId);
-				std::string getRegionId()const;
-				void setRegionId(const std::string& regionId);
-				long getEndTime()const;
-				void setEndTime(long endTime);
-				std::string getId()const;
-				void setId(const std::string& id);
-				long getStartTime()const;
-				void setStartTime(long startTime);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-
-            private:
-				long resourceOwnerId_;
-				std::string regionId_;
-				long endTime_;
-				std::string id_;
-				long startTime_;
-				std::string accessKeyId_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DESCRIBECLUSTEROPLOGREQUEST_H_

+ 0 - 68
emr/include/alibabacloud/emr/model/DescribeClusterOpLogResult.h

@@ -1,68 +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_EMR_MODEL_DESCRIBECLUSTEROPLOGRESULT_H_
-#define ALIBABACLOUD_EMR_MODEL_DESCRIBECLUSTEROPLOGRESULT_H_
-
-#include <string>
-#include <vector>
-#include <utility>
-#include <alibabacloud/core/ServiceResult.h>
-#include <alibabacloud/emr/EmrExport.h>
-
-namespace AlibabaCloud
-{
-	namespace Emr
-	{
-		namespace Model
-		{
-			class ALIBABACLOUD_EMR_EXPORT DescribeClusterOpLogResult : public ServiceResult
-			{
-			public:
-				struct ChangeLog
-				{
-					std::string status;
-					std::string gmtCreate;
-					std::string message;
-					std::string changeType;
-					std::string gmtModified;
-					std::string targetType;
-					long id;
-					std::string targetKey;
-				};
-
-
-				DescribeClusterOpLogResult();
-				explicit DescribeClusterOpLogResult(const std::string &payload);
-				~DescribeClusterOpLogResult();
-				std::string getPageSize()const;
-				std::string getPageNumber()const;
-				std::string getTotal()const;
-				std::vector<ChangeLog> getChangeLogList()const;
-
-			protected:
-				void parse(const std::string &payload);
-			private:
-				std::string pageSize_;
-				std::string pageNumber_;
-				std::string total_;
-				std::vector<ChangeLog> changeLogList_;
-
-			};
-		}
-	}
-}
-#endif // !ALIBABACLOUD_EMR_MODEL_DESCRIBECLUSTEROPLOGRESULT_H_

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác