diff --git a/CHANGELOG b/CHANGELOG index 1509c1a81..40e9ba791 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2022-05-23 Version: 1.36.1131 +- Support systemdisk encrypt and arns. +- Update tag parameters. + 2022-05-19 Version: 1.36.1130 - Update SubscribeBillToOSS and QueryBillToOSSSubscription to support BucketPath. diff --git a/VERSION b/VERSION index 9d15272e6..5a67f77c1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1130 \ No newline at end of file +1.36.1131 \ No newline at end of file diff --git a/ecs/CMakeLists.txt b/ecs/CMakeLists.txt index 358e00fdb..b0844a8e8 100644 --- a/ecs/CMakeLists.txt +++ b/ecs/CMakeLists.txt @@ -97,6 +97,8 @@ set(ecs_public_header_model include/alibabacloud/ecs/model/CreateDemandResult.h include/alibabacloud/ecs/model/CreateDeploymentSetRequest.h include/alibabacloud/ecs/model/CreateDeploymentSetResult.h + include/alibabacloud/ecs/model/CreateDiagnosticReportRequest.h + include/alibabacloud/ecs/model/CreateDiagnosticReportResult.h include/alibabacloud/ecs/model/CreateDiskRequest.h include/alibabacloud/ecs/model/CreateDiskResult.h include/alibabacloud/ecs/model/CreateElasticityAssuranceRequest.h @@ -770,6 +772,8 @@ set(ecs_src src/model/CreateDemandResult.cc src/model/CreateDeploymentSetRequest.cc src/model/CreateDeploymentSetResult.cc + src/model/CreateDiagnosticReportRequest.cc + src/model/CreateDiagnosticReportResult.cc src/model/CreateDiskRequest.cc src/model/CreateDiskResult.cc src/model/CreateElasticityAssuranceRequest.cc diff --git a/ecs/include/alibabacloud/ecs/EcsClient.h b/ecs/include/alibabacloud/ecs/EcsClient.h index d7823066e..eb5f66bdf 100644 --- a/ecs/include/alibabacloud/ecs/EcsClient.h +++ b/ecs/include/alibabacloud/ecs/EcsClient.h @@ -98,6 +98,8 @@ #include "model/CreateDemandResult.h" #include "model/CreateDeploymentSetRequest.h" #include "model/CreateDeploymentSetResult.h" +#include "model/CreateDiagnosticReportRequest.h" +#include "model/CreateDiagnosticReportResult.h" #include "model/CreateDiskRequest.h" #include "model/CreateDiskResult.h" #include "model/CreateElasticityAssuranceRequest.h" @@ -815,6 +817,9 @@ namespace AlibabaCloud typedef Outcome CreateDeploymentSetOutcome; typedef std::future CreateDeploymentSetOutcomeCallable; typedef std::function&)> CreateDeploymentSetAsyncHandler; + typedef Outcome CreateDiagnosticReportOutcome; + typedef std::future CreateDiagnosticReportOutcomeCallable; + typedef std::function&)> CreateDiagnosticReportAsyncHandler; typedef Outcome CreateDiskOutcome; typedef std::future CreateDiskOutcomeCallable; typedef std::function&)> CreateDiskAsyncHandler; @@ -1825,6 +1830,9 @@ namespace AlibabaCloud CreateDeploymentSetOutcome createDeploymentSet(const Model::CreateDeploymentSetRequest &request)const; void createDeploymentSetAsync(const Model::CreateDeploymentSetRequest& request, const CreateDeploymentSetAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; CreateDeploymentSetOutcomeCallable createDeploymentSetCallable(const Model::CreateDeploymentSetRequest& request) const; + CreateDiagnosticReportOutcome createDiagnosticReport(const Model::CreateDiagnosticReportRequest &request)const; + void createDiagnosticReportAsync(const Model::CreateDiagnosticReportRequest& request, const CreateDiagnosticReportAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + CreateDiagnosticReportOutcomeCallable createDiagnosticReportCallable(const Model::CreateDiagnosticReportRequest& request) const; CreateDiskOutcome createDisk(const Model::CreateDiskRequest &request)const; void createDiskAsync(const Model::CreateDiskRequest& request, const CreateDiskAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; CreateDiskOutcomeCallable createDiskCallable(const Model::CreateDiskRequest& request) const; diff --git a/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h b/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h index 841c5abd7..d7348f8b8 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h @@ -46,6 +46,16 @@ public: struct DataDiskConfig { std::string diskCategory; }; + struct LaunchConfigurationArn { + std::string rolearn; + std::string roleType; + long assumeRoleFor; + }; + struct LaunchConfigurationSystemDisk { + std::string encrypted; + std::string kMSKeyId; + std::string encryptAlgorithm; + }; struct LaunchTemplateConfig { std::string vSwitchId; double maxPrice; @@ -107,6 +117,8 @@ public: void setMinTargetCapacity(const std::string &minTargetCapacity); float getMaxSpotPrice() const; void setMaxSpotPrice(float maxSpotPrice); + std::vector getLaunchConfigurationArn() const; + void setLaunchConfigurationArn(const std::vector &launchConfigurationArn); bool getLaunchConfigurationPasswordInherit() const; void setLaunchConfigurationPasswordInherit(bool launchConfigurationPasswordInherit); std::string getClientToken() const; @@ -121,6 +133,8 @@ public: void setLaunchConfigurationUserData(const std::string &launchConfigurationUserData); std::string getLaunchConfigurationCreditSpecification() const; void setLaunchConfigurationCreditSpecification(const std::string &launchConfigurationCreditSpecification); + LaunchConfigurationSystemDisk getLaunchConfigurationSystemDisk() const; + void setLaunchConfigurationSystemDisk(const LaunchConfigurationSystemDisk &launchConfigurationSystemDisk); std::string getLaunchConfigurationInstanceName() const; void setLaunchConfigurationInstanceName(const std::string &launchConfigurationInstanceName); std::string getLaunchConfigurationInstanceDescription() const; @@ -199,6 +213,7 @@ private: std::string launchConfigurationHostName_; std::string minTargetCapacity_; float maxSpotPrice_; + std::vector launchConfigurationArn_; bool launchConfigurationPasswordInherit_; std::string clientToken_; std::string launchConfigurationSecurityGroupId_; @@ -206,6 +221,7 @@ private: bool terminateInstancesWithExpiration_; std::string launchConfigurationUserData_; std::string launchConfigurationCreditSpecification_; + LaunchConfigurationSystemDisk launchConfigurationSystemDisk_; std::string launchConfigurationInstanceName_; std::string launchConfigurationInstanceDescription_; std::string spotAllocationStrategy_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportRequest.h b/ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportRequest.h new file mode 100644 index 000000000..ba1a28b1e --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportRequest.h @@ -0,0 +1,84 @@ +/* + * 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_ECS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_ +#define ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Ecs { +namespace Model { +class ALIBABACLOUD_ECS_EXPORT CreateDiagnosticReportRequest : public RpcServiceRequest { +public: + CreateDiagnosticReportRequest(); + ~CreateDiagnosticReportRequest(); + long getResourceOwnerId() const; + void setResourceOwnerId(long resourceOwnerId); + std::string getClientToken() const; + void setClientToken(const std::string &clientToken); + std::string getStartTime() const; + void setStartTime(const std::string &startTime); + std::string getSourceSystem() const; + void setSourceSystem(const std::string &sourceSystem); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); + std::string getPluginVersion() const; + void setPluginVersion(const std::string &pluginVersion); + std::vector getResourceId() const; + void setResourceId(const std::vector &resourceId); + std::vector getCommandName() const; + void setCommandName(const std::vector &commandName); + std::string getResourceOwnerAccount() const; + void setResourceOwnerAccount(const std::string &resourceOwnerAccount); + std::string getOwnerAccount() const; + void setOwnerAccount(const std::string &ownerAccount); + std::string getEndTime() const; + void setEndTime(const std::string &endTime); + long getOwnerId() const; + void setOwnerId(long ownerId); + std::string getResourceType() const; + void setResourceType(const std::string &resourceType); + std::string getCommandType() const; + void setCommandType(const std::string &commandType); + std::string getDiagnosticCategory() const; + void setDiagnosticCategory(const std::string &diagnosticCategory); + +private: + long resourceOwnerId_; + std::string clientToken_; + std::string startTime_; + std::string sourceSystem_; + std::string regionId_; + std::string pluginVersion_; + std::vector resourceId_; + std::vector commandName_; + std::string resourceOwnerAccount_; + std::string ownerAccount_; + std::string endTime_; + long ownerId_; + std::string resourceType_; + std::string commandType_; + std::string diagnosticCategory_; +}; +} // namespace Model +} // namespace Ecs +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTREQUEST_H_ diff --git a/ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportResult.h b/ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportResult.h new file mode 100644 index 000000000..93a7833bb --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/CreateDiagnosticReportResult.h @@ -0,0 +1,63 @@ +/* + * 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_ECS_MODEL_CREATEDIAGNOSTICREPORTRESULT_H_ +#define ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT CreateDiagnosticReportResult : public ServiceResult + { + public: + struct InvokeResult + { + std::string commandName; + std::string invokeResult; + std::string dataFileDir; + }; + + + CreateDiagnosticReportResult(); + explicit CreateDiagnosticReportResult(const std::string &payload); + ~CreateDiagnosticReportResult(); + std::string getStatus()const; + std::vector getCommandInvokeResults()const; + std::string getCreateTime()const; + std::string getReportId()const; + + protected: + void parse(const std::string &payload); + private: + std::string status_; + std::vector commandInvokeResults_; + std::string createTime_; + std::string reportId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_CREATEDIAGNOSTICREPORTRESULT_H_ \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/CreateImageRequest.h b/ecs/include/alibabacloud/ecs/model/CreateImageRequest.h index cf4adfc6f..4d5e88788 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateImageRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateImageRequest.h @@ -54,6 +54,8 @@ public: void setPlatform(const std::string &platform); std::string getResourceGroupId() const; void setResourceGroupId(const std::string &resourceGroupId); + std::string getBootMode() const; + void setBootMode(const std::string &bootMode); std::string getRegionId() const; void setRegionId(const std::string ®ionId); std::string getImageName() const; @@ -83,6 +85,7 @@ private: std::string description_; std::string platform_; std::string resourceGroupId_; + std::string bootMode_; std::string regionId_; std::string imageName_; std::vector tag_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h b/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h index 36ea0a985..7aa76770c 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h @@ -29,7 +29,10 @@ namespace Model { class ALIBABACLOUD_ECS_EXPORT CreateInstanceRequest : public RpcServiceRequest { public: struct SystemDisk { + bool encrypted; + std::string encryptAlgorithm; std::string storageClusterId; + std::string kMSKeyId; }; struct Tag { std::string value; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h index 46d3f423d..20b909d3a 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeAccountAttributesRequest.h @@ -38,6 +38,8 @@ public: void setRegionId(const std::string ®ionId); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); + std::string getBizAliUid() const; + void setBizAliUid(const std::string &bizAliUid); long getOwnerId() const; void setOwnerId(long ownerId); std::string getZoneId() const; @@ -48,6 +50,7 @@ private: std::vector attributeName_; std::string regionId_; std::string resourceOwnerAccount_; + std::string bizAliUid_; long ownerId_; std::string zoneId_; }; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExRequest.h index 264131ab3..c29458921 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeAutoSnapshotPolicyExRequest.h @@ -54,6 +54,8 @@ public: void setOwnerAccount(const std::string &ownerAccount); long getOwnerId() const; void setOwnerId(long ownerId); + std::string getAutoSnapshotPolicyName() const; + void setAutoSnapshotPolicyName(const std::string &autoSnapshotPolicyName); private: long resourceOwnerId_; @@ -66,6 +68,7 @@ private: std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; + std::string autoSnapshotPolicyName_; }; } // namespace Model } // namespace Ecs diff --git a/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h index e72adbe73..db16cf646 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h @@ -32,6 +32,8 @@ public: ~DescribeAvailableResourceRequest(); long getResourceOwnerId() const; void setResourceOwnerId(long resourceOwnerId); + bool getNeedInventoryScore() const; + void setNeedInventoryScore(bool needInventoryScore); float getMemory() const; void setMemory(float memory); std::string getIoOptimized() const; @@ -52,6 +54,8 @@ public: void setNetworkCategory(const std::string &networkCategory); std::string getInstanceChargeType() const; void setInstanceChargeType(const std::string &instanceChargeType); + std::vector getInstanceFeatureOptions() const; + void setInstanceFeatureOptions(const std::vector &instanceFeatureOptions); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -73,6 +77,7 @@ public: private: long resourceOwnerId_; + bool needInventoryScore_; float memory_; std::string ioOptimized_; std::string dataDiskCategory_; @@ -83,6 +88,7 @@ private: std::string instanceType_; std::string networkCategory_; std::string instanceChargeType_; + std::vector instanceFeatureOptions_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string dedicatedHostId_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h index 3869cf97c..04a082d27 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeCommandsRequest.h @@ -48,6 +48,8 @@ public: void setContentEncoding(const std::string &contentEncoding); long getPageSize() const; void setPageSize(long pageSize); + bool getLatest() const; + void setLatest(bool latest); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -67,6 +69,7 @@ private: std::string provider_; std::string contentEncoding_; long pageSize_; + bool latest_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h index 1e209ae5e..29b49a75e 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeImagesResult.h @@ -58,6 +58,7 @@ namespace AlibabaCloud std::string platform; int size; bool isSubscribed; + std::string bootMode; std::string oSName; bool isPublic; std::string imageId; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h index 750d11e3e..091201fe1 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h @@ -54,6 +54,7 @@ namespace AlibabaCloud std::string creationTime; std::string deviceCategory; }; + std::string rack; std::string hostType; std::string device; std::string hostId; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h index 0739a900d..6e3607bbf 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h @@ -28,6 +28,10 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT DescribeInstanceTypesRequest : public RpcServiceRequest { public: + struct Filters { + std::string name; + std::string value; + }; DescribeInstanceTypesRequest(); ~DescribeInstanceTypesRequest(); long getResourceOwnerId() const; @@ -42,6 +46,8 @@ public: void setOwnerAccount(const std::string &ownerAccount); std::string getInstanceTypeFamily() const; void setInstanceTypeFamily(const std::string &instanceTypeFamily); + std::vector getFilters() const; + void setFilters(const std::vector &filters); long getOwnerId() const; void setOwnerId(long ownerId); long getMaxResults() const; @@ -54,6 +60,7 @@ private: std::string resourceOwnerAccount_; std::string ownerAccount_; std::string instanceTypeFamily_; + std::vector filters_; long ownerId_; long maxResults_; }; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h index e81c79a31..886cae2cb 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h @@ -140,6 +140,7 @@ namespace AlibabaCloud std::string internetChargeType; std::string deploymentSetId; std::string instanceName; + std::string spotInterruptionBehavior; int internetMaxBandwidthOut; std::string serialNumber; std::string oSType; diff --git a/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h b/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h index 5ae51a4a2..20fc92fa9 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h @@ -28,24 +28,28 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT DescribePriceRequest : public RpcServiceRequest { public: + struct SystemDisk { + int size; + std::string performanceLevel; + std::string category; + }; + struct DataDisk { + int size; + std::string performanceLevel; + std::string category; + }; DescribePriceRequest(); ~DescribePriceRequest(); - int getDataDisk3Size() const; - void setDataDisk3Size(int dataDisk3Size); long getResourceOwnerId() const; void setResourceOwnerId(long resourceOwnerId); - std::string getDataDisk3Category() const; - void setDataDisk3Category(const std::string &dataDisk3Category); std::string getIsp() const; void setIsp(const std::string &isp); - int getDataDisk4Size() const; - void setDataDisk4Size(int dataDisk4Size); + SystemDisk getSystemDisk() const; + void setSystemDisk(const SystemDisk &systemDisk); std::string getPriceUnit() const; void setPriceUnit(const std::string &priceUnit); int getPeriod() const; void setPeriod(int period); - std::string getDataDisk1PerformanceLevel() const; - void setDataDisk1PerformanceLevel(const std::string &dataDisk1PerformanceLevel); std::string getAssuranceTimes() const; void setAssuranceTimes(const std::string &assuranceTimes); long getOwnerId() const; @@ -64,26 +68,16 @@ public: void setInstanceAmount(int instanceAmount); std::vector getInstanceTypeList() const; void setInstanceTypeList(const std::vector &instanceTypeList); - std::string getDataDisk3PerformanceLevel() const; - void setDataDisk3PerformanceLevel(const std::string &dataDisk3PerformanceLevel); std::string getImageId() const; void setImageId(const std::string &imageId); std::string getIoOptimized() const; void setIoOptimized(const std::string &ioOptimized); int getInternetMaxBandwidthOut() const; void setInternetMaxBandwidthOut(int internetMaxBandwidthOut); - std::string getSystemDiskCategory() const; - void setSystemDiskCategory(const std::string &systemDiskCategory); std::string getPlatform() const; void setPlatform(const std::string &platform); int getCapacity() const; void setCapacity(int capacity); - std::string getSystemDiskPerformanceLevel() const; - void setSystemDiskPerformanceLevel(const std::string &systemDiskPerformanceLevel); - std::string getDataDisk4Category() const; - void setDataDisk4Category(const std::string &dataDisk4Category); - std::string getDataDisk4PerformanceLevel() const; - void setDataDisk4PerformanceLevel(const std::string &dataDisk4PerformanceLevel); std::string getRegionId() const; void setRegionId(const std::string ®ionId); std::string getScope() const; @@ -92,40 +86,27 @@ public: void setInstanceType(const std::string &instanceType); std::string getDedicatedHostType() const; void setDedicatedHostType(const std::string &dedicatedHostType); - std::string getDataDisk2Category() const; - void setDataDisk2Category(const std::string &dataDisk2Category); - int getDataDisk1Size() const; - void setDataDisk1Size(int dataDisk1Size); int getAmount() const; void setAmount(int amount); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; void setOwnerAccount(const std::string &ownerAccount); - int getDataDisk2Size() const; - void setDataDisk2Size(int dataDisk2Size); int getSpotDuration() const; void setSpotDuration(int spotDuration); std::string getResourceType() const; void setResourceType(const std::string &resourceType); - std::string getDataDisk1Category() const; - void setDataDisk1Category(const std::string &dataDisk1Category); - std::string getDataDisk2PerformanceLevel() const; - void setDataDisk2PerformanceLevel(const std::string &dataDisk2PerformanceLevel); - int getSystemDiskSize() const; - void setSystemDiskSize(int systemDiskSize); + std::vector getDataDisk() const; + void setDataDisk(const std::vector &dataDisk); std::string getOfferingType() const; void setOfferingType(const std::string &offeringType); private: - int dataDisk3Size_; long resourceOwnerId_; - std::string dataDisk3Category_; std::string isp_; - int dataDisk4Size_; + SystemDisk systemDisk_; std::string priceUnit_; int period_; - std::string dataDisk1PerformanceLevel_; std::string assuranceTimes_; long ownerId_; int instanceCpuCoreCount_; @@ -135,31 +116,21 @@ private: std::string instanceNetworkType_; int instanceAmount_; std::vector instanceTypeList_; - std::string dataDisk3PerformanceLevel_; std::string imageId_; std::string ioOptimized_; int internetMaxBandwidthOut_; - std::string systemDiskCategory_; std::string platform_; int capacity_; - std::string systemDiskPerformanceLevel_; - std::string dataDisk4Category_; - std::string dataDisk4PerformanceLevel_; std::string regionId_; std::string scope_; std::string instanceType_; std::string dedicatedHostType_; - std::string dataDisk2Category_; - int dataDisk1Size_; int amount_; std::string resourceOwnerAccount_; std::string ownerAccount_; - int dataDisk2Size_; int spotDuration_; std::string resourceType_; - std::string dataDisk1Category_; - std::string dataDisk2PerformanceLevel_; - int systemDiskSize_; + std::vector dataDisk_; std::string offeringType_; }; } // namespace Model diff --git a/ecs/include/alibabacloud/ecs/model/DescribeRecommendInstanceTypeRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeRecommendInstanceTypeRequest.h index c45671fd0..ce71e0d10 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeRecommendInstanceTypeRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeRecommendInstanceTypeRequest.h @@ -42,6 +42,8 @@ public: void setScene(const std::string &scene); int getCores() const; void setCores(int cores); + std::vector getZoneIds() const; + void setZoneIds(const std::vector &zoneIds); std::string getRegionId() const; void setRegionId(const std::string ®ionId); std::string getSystemDiskCategory() const; @@ -68,6 +70,8 @@ public: void setPriorityStrategy(const std::string &priorityStrategy); std::string getInstanceFamilyLevel() const; void setInstanceFamilyLevel(const std::string &instanceFamilyLevel); + bool getInstanceTypeSupportIPv6() const; + void setInstanceTypeSupportIPv6(bool instanceTypeSupportIPv6); std::string getZoneId() const; void setZoneId(const std::string &zoneId); @@ -78,6 +82,7 @@ private: std::string networkType_; std::string scene_; int cores_; + std::vector zoneIds_; std::string regionId_; std::string systemDiskCategory_; std::string instanceType_; @@ -91,6 +96,7 @@ private: std::string spotStrategy_; std::string priorityStrategy_; std::string instanceFamilyLevel_; + bool instanceTypeSupportIPv6_; std::string zoneId_; }; } // namespace Model diff --git a/ecs/include/alibabacloud/ecs/model/ModifySnapshotAttributeRequest.h b/ecs/include/alibabacloud/ecs/model/ModifySnapshotAttributeRequest.h index 853b3e401..b99dcec61 100644 --- a/ecs/include/alibabacloud/ecs/model/ModifySnapshotAttributeRequest.h +++ b/ecs/include/alibabacloud/ecs/model/ModifySnapshotAttributeRequest.h @@ -38,6 +38,8 @@ public: void setDescription(const std::string &description); std::string getSnapshotName() const; void setSnapshotName(const std::string &snapshotName); + long getInstantAccessRetentionDays() const; + void setInstantAccessRetentionDays(long instantAccessRetentionDays); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -46,16 +48,20 @@ public: void setOwnerId(long ownerId); bool getDisableInstantAccess() const; void setDisableInstantAccess(bool disableInstantAccess); + long getRetentionDays() const; + void setRetentionDays(long retentionDays); private: long resourceOwnerId_; std::string snapshotId_; std::string description_; std::string snapshotName_; + long instantAccessRetentionDays_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; bool disableInstantAccess_; + long retentionDays_; }; } // namespace Model } // namespace Ecs diff --git a/ecs/include/alibabacloud/ecs/model/RedeployDedicatedHostRequest.h b/ecs/include/alibabacloud/ecs/model/RedeployDedicatedHostRequest.h index 8856eda3e..7caec2928 100644 --- a/ecs/include/alibabacloud/ecs/model/RedeployDedicatedHostRequest.h +++ b/ecs/include/alibabacloud/ecs/model/RedeployDedicatedHostRequest.h @@ -42,6 +42,8 @@ public: void setDedicatedHostId(const std::string &dedicatedHostId); long getOwnerId() const; void setOwnerId(long ownerId); + bool getWaiveLocalDiskData() const; + void setWaiveLocalDiskData(bool waiveLocalDiskData); private: long resourceOwnerId_; @@ -50,6 +52,7 @@ private: std::string ownerAccount_; std::string dedicatedHostId_; long ownerId_; + bool waiveLocalDiskData_; }; } // namespace Model } // namespace Ecs diff --git a/ecs/include/alibabacloud/ecs/model/RunCommandRequest.h b/ecs/include/alibabacloud/ecs/model/RunCommandRequest.h index 5703e97c3..0b9d28dad 100644 --- a/ecs/include/alibabacloud/ecs/model/RunCommandRequest.h +++ b/ecs/include/alibabacloud/ecs/model/RunCommandRequest.h @@ -56,6 +56,8 @@ public: void setKeepCommand(bool keepCommand); bool getTimed() const; void setTimed(bool timed); + bool getDryRun() const; + void setDryRun(bool dryRun); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -87,6 +89,7 @@ private: std::string windowsPasswordName_; bool keepCommand_; bool timed_; + bool dryRun_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/src/EcsClient.cc b/ecs/src/EcsClient.cc index 155e387d9..91c26bccb 100644 --- a/ecs/src/EcsClient.cc +++ b/ecs/src/EcsClient.cc @@ -1419,6 +1419,42 @@ EcsClient::CreateDeploymentSetOutcomeCallable EcsClient::createDeploymentSetCall return task->get_future(); } +EcsClient::CreateDiagnosticReportOutcome EcsClient::createDiagnosticReport(const CreateDiagnosticReportRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return CreateDiagnosticReportOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return CreateDiagnosticReportOutcome(CreateDiagnosticReportResult(outcome.result())); + else + return CreateDiagnosticReportOutcome(outcome.error()); +} + +void EcsClient::createDiagnosticReportAsync(const CreateDiagnosticReportRequest& request, const CreateDiagnosticReportAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, createDiagnosticReport(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EcsClient::CreateDiagnosticReportOutcomeCallable EcsClient::createDiagnosticReportCallable(const CreateDiagnosticReportRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->createDiagnosticReport(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EcsClient::CreateDiskOutcome EcsClient::createDisk(const CreateDiskRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/ecs/src/model/AddTagsRequest.cc b/ecs/src/model/AddTagsRequest.cc index 148e6fcb6..19b5a9b6f 100644 --- a/ecs/src/model/AddTagsRequest.cc +++ b/ecs/src/model/AddTagsRequest.cc @@ -52,7 +52,7 @@ void AddTagsRequest::setTag(const std::vector &tag) { for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/CreateAutoProvisioningGroupRequest.cc b/ecs/src/model/CreateAutoProvisioningGroupRequest.cc index 44849b31a..dd7b049c5 100644 --- a/ecs/src/model/CreateAutoProvisioningGroupRequest.cc +++ b/ecs/src/model/CreateAutoProvisioningGroupRequest.cc @@ -260,6 +260,21 @@ void CreateAutoProvisioningGroupRequest::setMaxSpotPrice(float maxSpotPrice) { setParameter(std::string("MaxSpotPrice"), std::to_string(maxSpotPrice)); } +std::vector CreateAutoProvisioningGroupRequest::getLaunchConfigurationArn() const { + return launchConfigurationArn_; +} + +void CreateAutoProvisioningGroupRequest::setLaunchConfigurationArn(const std::vector &launchConfigurationArn) { + launchConfigurationArn_ = launchConfigurationArn; + for(int dep1 = 0; dep1 != launchConfigurationArn.size(); dep1++) { + auto launchConfigurationArnObj = launchConfigurationArn.at(dep1); + std::string launchConfigurationArnObjStr = std::string("LaunchConfiguration.Arn") + "." + std::to_string(dep1 + 1); + setParameter(launchConfigurationArnObjStr + ".Rolearn", launchConfigurationArnObj.rolearn); + setParameter(launchConfigurationArnObjStr + ".RoleType", launchConfigurationArnObj.roleType); + setParameter(launchConfigurationArnObjStr + ".AssumeRoleFor", std::to_string(launchConfigurationArnObj.assumeRoleFor)); + } +} + bool CreateAutoProvisioningGroupRequest::getLaunchConfigurationPasswordInherit() const { return launchConfigurationPasswordInherit_; } @@ -323,6 +338,17 @@ void CreateAutoProvisioningGroupRequest::setLaunchConfigurationCreditSpecificati setParameter(std::string("LaunchConfiguration.CreditSpecification"), launchConfigurationCreditSpecification); } +CreateAutoProvisioningGroupRequest::LaunchConfigurationSystemDisk CreateAutoProvisioningGroupRequest::getLaunchConfigurationSystemDisk() const { + return launchConfigurationSystemDisk_; +} + +void CreateAutoProvisioningGroupRequest::setLaunchConfigurationSystemDisk(const CreateAutoProvisioningGroupRequest::LaunchConfigurationSystemDisk &launchConfigurationSystemDisk) { + launchConfigurationSystemDisk_ = launchConfigurationSystemDisk; + setParameter(std::string("LaunchConfiguration.SystemDisk") + ".Encrypted", launchConfigurationSystemDisk.encrypted); + setParameter(std::string("LaunchConfiguration.SystemDisk") + ".KMSKeyId", launchConfigurationSystemDisk.kMSKeyId); + setParameter(std::string("LaunchConfiguration.SystemDisk") + ".EncryptAlgorithm", launchConfigurationSystemDisk.encryptAlgorithm); +} + std::string CreateAutoProvisioningGroupRequest::getLaunchConfigurationInstanceName() const { return launchConfigurationInstanceName_; } diff --git a/ecs/src/model/CreateDiagnosticReportRequest.cc b/ecs/src/model/CreateDiagnosticReportRequest.cc new file mode 100644 index 000000000..55d1572fc --- /dev/null +++ b/ecs/src/model/CreateDiagnosticReportRequest.cc @@ -0,0 +1,160 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +using AlibabaCloud::Ecs::Model::CreateDiagnosticReportRequest; + +CreateDiagnosticReportRequest::CreateDiagnosticReportRequest() + : RpcServiceRequest("ecs", "2014-05-26", "CreateDiagnosticReport") { + setMethod(HttpRequest::Method::Post); +} + +CreateDiagnosticReportRequest::~CreateDiagnosticReportRequest() {} + +long CreateDiagnosticReportRequest::getResourceOwnerId() const { + return resourceOwnerId_; +} + +void CreateDiagnosticReportRequest::setResourceOwnerId(long resourceOwnerId) { + resourceOwnerId_ = resourceOwnerId; + setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); +} + +std::string CreateDiagnosticReportRequest::getClientToken() const { + return clientToken_; +} + +void CreateDiagnosticReportRequest::setClientToken(const std::string &clientToken) { + clientToken_ = clientToken; + setParameter(std::string("ClientToken"), clientToken); +} + +std::string CreateDiagnosticReportRequest::getStartTime() const { + return startTime_; +} + +void CreateDiagnosticReportRequest::setStartTime(const std::string &startTime) { + startTime_ = startTime; + setParameter(std::string("StartTime"), startTime); +} + +std::string CreateDiagnosticReportRequest::getSourceSystem() const { + return sourceSystem_; +} + +void CreateDiagnosticReportRequest::setSourceSystem(const std::string &sourceSystem) { + sourceSystem_ = sourceSystem; + setParameter(std::string("SourceSystem"), sourceSystem); +} + +std::string CreateDiagnosticReportRequest::getRegionId() const { + return regionId_; +} + +void CreateDiagnosticReportRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + +std::string CreateDiagnosticReportRequest::getPluginVersion() const { + return pluginVersion_; +} + +void CreateDiagnosticReportRequest::setPluginVersion(const std::string &pluginVersion) { + pluginVersion_ = pluginVersion; + setParameter(std::string("PluginVersion"), pluginVersion); +} + +std::vector CreateDiagnosticReportRequest::getResourceId() const { + return resourceId_; +} + +void CreateDiagnosticReportRequest::setResourceId(const std::vector &resourceId) { + resourceId_ = resourceId; +} + +std::vector CreateDiagnosticReportRequest::getCommandName() const { + return commandName_; +} + +void CreateDiagnosticReportRequest::setCommandName(const std::vector &commandName) { + commandName_ = commandName; +} + +std::string CreateDiagnosticReportRequest::getResourceOwnerAccount() const { + return resourceOwnerAccount_; +} + +void CreateDiagnosticReportRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) { + resourceOwnerAccount_ = resourceOwnerAccount; + setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount); +} + +std::string CreateDiagnosticReportRequest::getOwnerAccount() const { + return ownerAccount_; +} + +void CreateDiagnosticReportRequest::setOwnerAccount(const std::string &ownerAccount) { + ownerAccount_ = ownerAccount; + setParameter(std::string("OwnerAccount"), ownerAccount); +} + +std::string CreateDiagnosticReportRequest::getEndTime() const { + return endTime_; +} + +void CreateDiagnosticReportRequest::setEndTime(const std::string &endTime) { + endTime_ = endTime; + setParameter(std::string("EndTime"), endTime); +} + +long CreateDiagnosticReportRequest::getOwnerId() const { + return ownerId_; +} + +void CreateDiagnosticReportRequest::setOwnerId(long ownerId) { + ownerId_ = ownerId; + setParameter(std::string("OwnerId"), std::to_string(ownerId)); +} + +std::string CreateDiagnosticReportRequest::getResourceType() const { + return resourceType_; +} + +void CreateDiagnosticReportRequest::setResourceType(const std::string &resourceType) { + resourceType_ = resourceType; + setParameter(std::string("ResourceType"), resourceType); +} + +std::string CreateDiagnosticReportRequest::getCommandType() const { + return commandType_; +} + +void CreateDiagnosticReportRequest::setCommandType(const std::string &commandType) { + commandType_ = commandType; + setParameter(std::string("CommandType"), commandType); +} + +std::string CreateDiagnosticReportRequest::getDiagnosticCategory() const { + return diagnosticCategory_; +} + +void CreateDiagnosticReportRequest::setDiagnosticCategory(const std::string &diagnosticCategory) { + diagnosticCategory_ = diagnosticCategory; + setParameter(std::string("DiagnosticCategory"), diagnosticCategory); +} + diff --git a/ecs/src/model/CreateDiagnosticReportResult.cc b/ecs/src/model/CreateDiagnosticReportResult.cc new file mode 100644 index 000000000..732b91758 --- /dev/null +++ b/ecs/src/model/CreateDiagnosticReportResult.cc @@ -0,0 +1,82 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +using namespace AlibabaCloud::Ecs; +using namespace AlibabaCloud::Ecs::Model; + +CreateDiagnosticReportResult::CreateDiagnosticReportResult() : + ServiceResult() +{} + +CreateDiagnosticReportResult::CreateDiagnosticReportResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +CreateDiagnosticReportResult::~CreateDiagnosticReportResult() +{} + +void CreateDiagnosticReportResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + auto allCommandInvokeResultsNode = value["CommandInvokeResults"]["InvokeResult"]; + for (auto valueCommandInvokeResultsInvokeResult : allCommandInvokeResultsNode) + { + InvokeResult commandInvokeResultsObject; + if(!valueCommandInvokeResultsInvokeResult["DataFileDir"].isNull()) + commandInvokeResultsObject.dataFileDir = valueCommandInvokeResultsInvokeResult["DataFileDir"].asString(); + if(!valueCommandInvokeResultsInvokeResult["InvokeResult"].isNull()) + commandInvokeResultsObject.invokeResult = valueCommandInvokeResultsInvokeResult["InvokeResult"].asString(); + if(!valueCommandInvokeResultsInvokeResult["CommandName"].isNull()) + commandInvokeResultsObject.commandName = valueCommandInvokeResultsInvokeResult["CommandName"].asString(); + commandInvokeResults_.push_back(commandInvokeResultsObject); + } + if(!value["Status"].isNull()) + status_ = value["Status"].asString(); + if(!value["ReportId"].isNull()) + reportId_ = value["ReportId"].asString(); + if(!value["CreateTime"].isNull()) + createTime_ = value["CreateTime"].asString(); + +} + +std::string CreateDiagnosticReportResult::getStatus()const +{ + return status_; +} + +std::vector CreateDiagnosticReportResult::getCommandInvokeResults()const +{ + return commandInvokeResults_; +} + +std::string CreateDiagnosticReportResult::getCreateTime()const +{ + return createTime_; +} + +std::string CreateDiagnosticReportResult::getReportId()const +{ + return reportId_; +} + diff --git a/ecs/src/model/CreateDiskRequest.cc b/ecs/src/model/CreateDiskRequest.cc index 83e32d38f..8e7ee6f3f 100644 --- a/ecs/src/model/CreateDiskRequest.cc +++ b/ecs/src/model/CreateDiskRequest.cc @@ -133,7 +133,7 @@ void CreateDiskRequest::setTag(const std::vector &tag) { for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/CreateImageRequest.cc b/ecs/src/model/CreateImageRequest.cc index 496a0a90e..a64211d43 100644 --- a/ecs/src/model/CreateImageRequest.cc +++ b/ecs/src/model/CreateImageRequest.cc @@ -95,6 +95,15 @@ void CreateImageRequest::setResourceGroupId(const std::string &resourceGroupId) setParameter(std::string("ResourceGroupId"), resourceGroupId); } +std::string CreateImageRequest::getBootMode() const { + return bootMode_; +} + +void CreateImageRequest::setBootMode(const std::string &bootMode) { + bootMode_ = bootMode; + setParameter(std::string("BootMode"), bootMode); +} + std::string CreateImageRequest::getRegionId() const { return regionId_; } @@ -122,7 +131,7 @@ void CreateImageRequest::setTag(const std::vector &tag) for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/CreateInstanceRequest.cc b/ecs/src/model/CreateInstanceRequest.cc index fc014396d..9f38b83fe 100644 --- a/ecs/src/model/CreateInstanceRequest.cc +++ b/ecs/src/model/CreateInstanceRequest.cc @@ -130,7 +130,10 @@ CreateInstanceRequest::SystemDisk CreateInstanceRequest::getSystemDisk() const { void CreateInstanceRequest::setSystemDisk(const CreateInstanceRequest::SystemDisk &systemDisk) { systemDisk_ = systemDisk; + setParameter(std::string("SystemDisk") + ".Encrypted", systemDisk.encrypted ? "true" : "false"); + setParameter(std::string("SystemDisk") + ".EncryptAlgorithm", systemDisk.encryptAlgorithm); setParameter(std::string("SystemDisk") + ".StorageClusterId", systemDisk.storageClusterId); + setParameter(std::string("SystemDisk") + ".KMSKeyId", systemDisk.kMSKeyId); } int CreateInstanceRequest::getDeploymentSetGroupNo() const { @@ -160,7 +163,7 @@ void CreateInstanceRequest::setTag(const std::vector for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/CreateSecurityGroupRequest.cc b/ecs/src/model/CreateSecurityGroupRequest.cc index 2ca65d5f6..87f86fba2 100644 --- a/ecs/src/model/CreateSecurityGroupRequest.cc +++ b/ecs/src/model/CreateSecurityGroupRequest.cc @@ -97,7 +97,7 @@ void CreateSecurityGroupRequest::setTag(const std::vector for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/DescribeAccountAttributesRequest.cc b/ecs/src/model/DescribeAccountAttributesRequest.cc index e61a868ed..0ceec9460 100644 --- a/ecs/src/model/DescribeAccountAttributesRequest.cc +++ b/ecs/src/model/DescribeAccountAttributesRequest.cc @@ -60,6 +60,15 @@ void DescribeAccountAttributesRequest::setResourceOwnerAccount(const std::string setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount); } +std::string DescribeAccountAttributesRequest::getBizAliUid() const { + return bizAliUid_; +} + +void DescribeAccountAttributesRequest::setBizAliUid(const std::string &bizAliUid) { + bizAliUid_ = bizAliUid; + setParameter(std::string("BizAliUid"), bizAliUid); +} + long DescribeAccountAttributesRequest::getOwnerId() const { return ownerId_; } diff --git a/ecs/src/model/DescribeAutoSnapshotPolicyExRequest.cc b/ecs/src/model/DescribeAutoSnapshotPolicyExRequest.cc index 4c3f6af46..9ae36a833 100644 --- a/ecs/src/model/DescribeAutoSnapshotPolicyExRequest.cc +++ b/ecs/src/model/DescribeAutoSnapshotPolicyExRequest.cc @@ -120,3 +120,12 @@ void DescribeAutoSnapshotPolicyExRequest::setOwnerId(long ownerId) { setParameter(std::string("OwnerId"), std::to_string(ownerId)); } +std::string DescribeAutoSnapshotPolicyExRequest::getAutoSnapshotPolicyName() const { + return autoSnapshotPolicyName_; +} + +void DescribeAutoSnapshotPolicyExRequest::setAutoSnapshotPolicyName(const std::string &autoSnapshotPolicyName) { + autoSnapshotPolicyName_ = autoSnapshotPolicyName; + setParameter(std::string("AutoSnapshotPolicyName"), autoSnapshotPolicyName); +} + diff --git a/ecs/src/model/DescribeAvailableResourceRequest.cc b/ecs/src/model/DescribeAvailableResourceRequest.cc index 7dde1a7ac..2bd1766cb 100644 --- a/ecs/src/model/DescribeAvailableResourceRequest.cc +++ b/ecs/src/model/DescribeAvailableResourceRequest.cc @@ -34,6 +34,15 @@ void DescribeAvailableResourceRequest::setResourceOwnerId(long resourceOwnerId) setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); } +bool DescribeAvailableResourceRequest::getNeedInventoryScore() const { + return needInventoryScore_; +} + +void DescribeAvailableResourceRequest::setNeedInventoryScore(bool needInventoryScore) { + needInventoryScore_ = needInventoryScore; + setParameter(std::string("NeedInventoryScore"), needInventoryScore ? "true" : "false"); +} + float DescribeAvailableResourceRequest::getMemory() const { return memory_; } @@ -124,6 +133,14 @@ void DescribeAvailableResourceRequest::setInstanceChargeType(const std::string & setParameter(std::string("InstanceChargeType"), instanceChargeType); } +std::vector DescribeAvailableResourceRequest::getInstanceFeatureOptions() const { + return instanceFeatureOptions_; +} + +void DescribeAvailableResourceRequest::setInstanceFeatureOptions(const std::vector &instanceFeatureOptions) { + instanceFeatureOptions_ = instanceFeatureOptions; +} + std::string DescribeAvailableResourceRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/ecs/src/model/DescribeCommandsRequest.cc b/ecs/src/model/DescribeCommandsRequest.cc index ce7e1f141..e10bf51f3 100644 --- a/ecs/src/model/DescribeCommandsRequest.cc +++ b/ecs/src/model/DescribeCommandsRequest.cc @@ -106,6 +106,15 @@ void DescribeCommandsRequest::setPageSize(long pageSize) { setParameter(std::string("PageSize"), std::to_string(pageSize)); } +bool DescribeCommandsRequest::getLatest() const { + return latest_; +} + +void DescribeCommandsRequest::setLatest(bool latest) { + latest_ = latest; + setParameter(std::string("Latest"), latest ? "true" : "false"); +} + std::string DescribeCommandsRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/ecs/src/model/DescribeDisksRequest.cc b/ecs/src/model/DescribeDisksRequest.cc index 125de0104..6de45201d 100644 --- a/ecs/src/model/DescribeDisksRequest.cc +++ b/ecs/src/model/DescribeDisksRequest.cc @@ -115,7 +115,7 @@ void DescribeDisksRequest::setTag(const std::vector & for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/DescribeImagesRequest.cc b/ecs/src/model/DescribeImagesRequest.cc index 987296346..ca3ebf262 100644 --- a/ecs/src/model/DescribeImagesRequest.cc +++ b/ecs/src/model/DescribeImagesRequest.cc @@ -178,7 +178,7 @@ void DescribeImagesRequest::setTag(const std::vector for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/DescribeImagesResult.cc b/ecs/src/model/DescribeImagesResult.cc index 51b6d22e5..0a06337a6 100644 --- a/ecs/src/model/DescribeImagesResult.cc +++ b/ecs/src/model/DescribeImagesResult.cc @@ -89,6 +89,8 @@ void DescribeImagesResult::parse(const std::string &payload) imagesObject.productCode = valueImagesImage["ProductCode"].asString(); if(!valueImagesImage["Architecture"].isNull()) imagesObject.architecture = valueImagesImage["Architecture"].asString(); + if(!valueImagesImage["BootMode"].isNull()) + imagesObject.bootMode = valueImagesImage["BootMode"].asString(); if(!valueImagesImage["IsPublic"].isNull()) imagesObject.isPublic = valueImagesImage["IsPublic"].asString() == "true"; if(!valueImagesImage["ImageOwnerId"].isNull()) diff --git a/ecs/src/model/DescribeInstanceHistoryEventsResult.cc b/ecs/src/model/DescribeInstanceHistoryEventsResult.cc index 0db6b849d..e4c9ab4a9 100644 --- a/ecs/src/model/DescribeInstanceHistoryEventsResult.cc +++ b/ecs/src/model/DescribeInstanceHistoryEventsResult.cc @@ -80,6 +80,8 @@ void DescribeInstanceHistoryEventsResult::parse(const std::string &payload) instanceSystemEventSetObject.extendedAttribute.hostId = extendedAttributeNode["HostId"].asString(); if(!extendedAttributeNode["OnlineRepairPolicy"].isNull()) instanceSystemEventSetObject.extendedAttribute.onlineRepairPolicy = extendedAttributeNode["OnlineRepairPolicy"].asString(); + if(!extendedAttributeNode["Rack"].isNull()) + instanceSystemEventSetObject.extendedAttribute.rack = extendedAttributeNode["Rack"].asString(); auto allInactiveDisksNode = extendedAttributeNode["InactiveDisks"]["InactiveDisk"]; for (auto extendedAttributeNodeInactiveDisksInactiveDisk : allInactiveDisksNode) { diff --git a/ecs/src/model/DescribeInstanceTypesRequest.cc b/ecs/src/model/DescribeInstanceTypesRequest.cc index dbe544cc6..902a8d7d2 100644 --- a/ecs/src/model/DescribeInstanceTypesRequest.cc +++ b/ecs/src/model/DescribeInstanceTypesRequest.cc @@ -78,6 +78,18 @@ void DescribeInstanceTypesRequest::setInstanceTypeFamily(const std::string &inst setParameter(std::string("InstanceTypeFamily"), instanceTypeFamily); } +std::vector DescribeInstanceTypesRequest::getFilters() const { + return filters_; +} + +void DescribeInstanceTypesRequest::setFilters(const std::vector &filters) { + filters_ = filters; + for(int dep1 = 0; dep1 != filters.size(); dep1++) { + setParameter(std::string("Filters") + "." + std::to_string(dep1 + 1) + ".Name", filters[dep1].name); + setParameter(std::string("Filters") + "." + std::to_string(dep1 + 1) + ".Value", filters[dep1].value); + } +} + long DescribeInstanceTypesRequest::getOwnerId() const { return ownerId_; } diff --git a/ecs/src/model/DescribeInstancesRequest.cc b/ecs/src/model/DescribeInstancesRequest.cc index aed1517d9..fd969a722 100644 --- a/ecs/src/model/DescribeInstancesRequest.cc +++ b/ecs/src/model/DescribeInstancesRequest.cc @@ -133,7 +133,7 @@ void DescribeInstancesRequest::setTag(const std::vector &i instanceTypeList_ = instanceTypeList; } -std::string DescribePriceRequest::getDataDisk3PerformanceLevel() const { - return dataDisk3PerformanceLevel_; -} - -void DescribePriceRequest::setDataDisk3PerformanceLevel(const std::string &dataDisk3PerformanceLevel) { - dataDisk3PerformanceLevel_ = dataDisk3PerformanceLevel; - setParameter(std::string("DataDisk.3.PerformanceLevel"), dataDisk3PerformanceLevel); -} - std::string DescribePriceRequest::getImageId() const { return imageId_; } @@ -213,15 +179,6 @@ void DescribePriceRequest::setInternetMaxBandwidthOut(int internetMaxBandwidthOu setParameter(std::string("InternetMaxBandwidthOut"), std::to_string(internetMaxBandwidthOut)); } -std::string DescribePriceRequest::getSystemDiskCategory() const { - return systemDiskCategory_; -} - -void DescribePriceRequest::setSystemDiskCategory(const std::string &systemDiskCategory) { - systemDiskCategory_ = systemDiskCategory; - setParameter(std::string("SystemDisk.Category"), systemDiskCategory); -} - std::string DescribePriceRequest::getPlatform() const { return platform_; } @@ -240,33 +197,6 @@ void DescribePriceRequest::setCapacity(int capacity) { setParameter(std::string("Capacity"), std::to_string(capacity)); } -std::string DescribePriceRequest::getSystemDiskPerformanceLevel() const { - return systemDiskPerformanceLevel_; -} - -void DescribePriceRequest::setSystemDiskPerformanceLevel(const std::string &systemDiskPerformanceLevel) { - systemDiskPerformanceLevel_ = systemDiskPerformanceLevel; - setParameter(std::string("SystemDisk.PerformanceLevel"), systemDiskPerformanceLevel); -} - -std::string DescribePriceRequest::getDataDisk4Category() const { - return dataDisk4Category_; -} - -void DescribePriceRequest::setDataDisk4Category(const std::string &dataDisk4Category) { - dataDisk4Category_ = dataDisk4Category; - setParameter(std::string("DataDisk.4.Category"), dataDisk4Category); -} - -std::string DescribePriceRequest::getDataDisk4PerformanceLevel() const { - return dataDisk4PerformanceLevel_; -} - -void DescribePriceRequest::setDataDisk4PerformanceLevel(const std::string &dataDisk4PerformanceLevel) { - dataDisk4PerformanceLevel_ = dataDisk4PerformanceLevel; - setParameter(std::string("DataDisk.4.PerformanceLevel"), dataDisk4PerformanceLevel); -} - std::string DescribePriceRequest::getRegionId() const { return regionId_; } @@ -303,24 +233,6 @@ void DescribePriceRequest::setDedicatedHostType(const std::string &dedicatedHost setParameter(std::string("DedicatedHostType"), dedicatedHostType); } -std::string DescribePriceRequest::getDataDisk2Category() const { - return dataDisk2Category_; -} - -void DescribePriceRequest::setDataDisk2Category(const std::string &dataDisk2Category) { - dataDisk2Category_ = dataDisk2Category; - setParameter(std::string("DataDisk.2.Category"), dataDisk2Category); -} - -int DescribePriceRequest::getDataDisk1Size() const { - return dataDisk1Size_; -} - -void DescribePriceRequest::setDataDisk1Size(int dataDisk1Size) { - dataDisk1Size_ = dataDisk1Size; - setParameter(std::string("DataDisk.1.Size"), std::to_string(dataDisk1Size)); -} - int DescribePriceRequest::getAmount() const { return amount_; } @@ -348,15 +260,6 @@ void DescribePriceRequest::setOwnerAccount(const std::string &ownerAccount) { setParameter(std::string("OwnerAccount"), ownerAccount); } -int DescribePriceRequest::getDataDisk2Size() const { - return dataDisk2Size_; -} - -void DescribePriceRequest::setDataDisk2Size(int dataDisk2Size) { - dataDisk2Size_ = dataDisk2Size; - setParameter(std::string("DataDisk.2.Size"), std::to_string(dataDisk2Size)); -} - int DescribePriceRequest::getSpotDuration() const { return spotDuration_; } @@ -375,31 +278,17 @@ void DescribePriceRequest::setResourceType(const std::string &resourceType) { setParameter(std::string("ResourceType"), resourceType); } -std::string DescribePriceRequest::getDataDisk1Category() const { - return dataDisk1Category_; +std::vector DescribePriceRequest::getDataDisk() const { + return dataDisk_; } -void DescribePriceRequest::setDataDisk1Category(const std::string &dataDisk1Category) { - dataDisk1Category_ = dataDisk1Category; - setParameter(std::string("DataDisk.1.Category"), dataDisk1Category); -} - -std::string DescribePriceRequest::getDataDisk2PerformanceLevel() const { - return dataDisk2PerformanceLevel_; -} - -void DescribePriceRequest::setDataDisk2PerformanceLevel(const std::string &dataDisk2PerformanceLevel) { - dataDisk2PerformanceLevel_ = dataDisk2PerformanceLevel; - setParameter(std::string("DataDisk.2.PerformanceLevel"), dataDisk2PerformanceLevel); -} - -int DescribePriceRequest::getSystemDiskSize() const { - return systemDiskSize_; -} - -void DescribePriceRequest::setSystemDiskSize(int systemDiskSize) { - systemDiskSize_ = systemDiskSize; - setParameter(std::string("SystemDisk.Size"), std::to_string(systemDiskSize)); +void DescribePriceRequest::setDataDisk(const std::vector &dataDisk) { + dataDisk_ = dataDisk; + for(int dep1 = 0; dep1 != dataDisk.size(); dep1++) { + setParameter(std::string("DataDisk") + "." + std::to_string(dep1 + 1) + ".Size", std::to_string(dataDisk[dep1].size)); + setParameter(std::string("DataDisk") + "." + std::to_string(dep1 + 1) + ".PerformanceLevel", dataDisk[dep1].performanceLevel); + setParameter(std::string("DataDisk") + "." + std::to_string(dep1 + 1) + ".Category", dataDisk[dep1].category); + } } std::string DescribePriceRequest::getOfferingType() const { diff --git a/ecs/src/model/DescribeRecommendInstanceTypeRequest.cc b/ecs/src/model/DescribeRecommendInstanceTypeRequest.cc index 75c26d88e..35dfafe6a 100644 --- a/ecs/src/model/DescribeRecommendInstanceTypeRequest.cc +++ b/ecs/src/model/DescribeRecommendInstanceTypeRequest.cc @@ -79,6 +79,14 @@ void DescribeRecommendInstanceTypeRequest::setCores(int cores) { setParameter(std::string("Cores"), std::to_string(cores)); } +std::vector DescribeRecommendInstanceTypeRequest::getZoneIds() const { + return zoneIds_; +} + +void DescribeRecommendInstanceTypeRequest::setZoneIds(const std::vector &zoneIds) { + zoneIds_ = zoneIds; +} + std::string DescribeRecommendInstanceTypeRequest::getRegionId() const { return regionId_; } @@ -195,6 +203,15 @@ void DescribeRecommendInstanceTypeRequest::setInstanceFamilyLevel(const std::str setParameter(std::string("InstanceFamilyLevel"), instanceFamilyLevel); } +bool DescribeRecommendInstanceTypeRequest::getInstanceTypeSupportIPv6() const { + return instanceTypeSupportIPv6_; +} + +void DescribeRecommendInstanceTypeRequest::setInstanceTypeSupportIPv6(bool instanceTypeSupportIPv6) { + instanceTypeSupportIPv6_ = instanceTypeSupportIPv6; + setParameter(std::string("InstanceTypeSupportIPv6"), instanceTypeSupportIPv6 ? "true" : "false"); +} + std::string DescribeRecommendInstanceTypeRequest::getZoneId() const { return zoneId_; } diff --git a/ecs/src/model/DescribeResourceByTagsRequest.cc b/ecs/src/model/DescribeResourceByTagsRequest.cc index 8fb310f7e..23c01c1b6 100644 --- a/ecs/src/model/DescribeResourceByTagsRequest.cc +++ b/ecs/src/model/DescribeResourceByTagsRequest.cc @@ -70,7 +70,7 @@ void DescribeResourceByTagsRequest::setTag(const std::vector &ta for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/ModifySnapshotAttributeRequest.cc b/ecs/src/model/ModifySnapshotAttributeRequest.cc index f92ab7f1b..a30495f56 100644 --- a/ecs/src/model/ModifySnapshotAttributeRequest.cc +++ b/ecs/src/model/ModifySnapshotAttributeRequest.cc @@ -61,6 +61,15 @@ void ModifySnapshotAttributeRequest::setSnapshotName(const std::string &snapshot setParameter(std::string("SnapshotName"), snapshotName); } +long ModifySnapshotAttributeRequest::getInstantAccessRetentionDays() const { + return instantAccessRetentionDays_; +} + +void ModifySnapshotAttributeRequest::setInstantAccessRetentionDays(long instantAccessRetentionDays) { + instantAccessRetentionDays_ = instantAccessRetentionDays; + setParameter(std::string("InstantAccessRetentionDays"), std::to_string(instantAccessRetentionDays)); +} + std::string ModifySnapshotAttributeRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } @@ -97,3 +106,12 @@ void ModifySnapshotAttributeRequest::setDisableInstantAccess(bool disableInstant setParameter(std::string("DisableInstantAccess"), disableInstantAccess ? "true" : "false"); } +long ModifySnapshotAttributeRequest::getRetentionDays() const { + return retentionDays_; +} + +void ModifySnapshotAttributeRequest::setRetentionDays(long retentionDays) { + retentionDays_ = retentionDays; + setParameter(std::string("RetentionDays"), std::to_string(retentionDays)); +} + diff --git a/ecs/src/model/RedeployDedicatedHostRequest.cc b/ecs/src/model/RedeployDedicatedHostRequest.cc index 2a01491ff..9afec27d7 100644 --- a/ecs/src/model/RedeployDedicatedHostRequest.cc +++ b/ecs/src/model/RedeployDedicatedHostRequest.cc @@ -79,3 +79,12 @@ void RedeployDedicatedHostRequest::setOwnerId(long ownerId) { setParameter(std::string("OwnerId"), std::to_string(ownerId)); } +bool RedeployDedicatedHostRequest::getWaiveLocalDiskData() const { + return waiveLocalDiskData_; +} + +void RedeployDedicatedHostRequest::setWaiveLocalDiskData(bool waiveLocalDiskData) { + waiveLocalDiskData_ = waiveLocalDiskData; + setParameter(std::string("WaiveLocalDiskData"), waiveLocalDiskData ? "true" : "false"); +} + diff --git a/ecs/src/model/RemoveTagsRequest.cc b/ecs/src/model/RemoveTagsRequest.cc index aeae2c5e9..ca5f6ef76 100644 --- a/ecs/src/model/RemoveTagsRequest.cc +++ b/ecs/src/model/RemoveTagsRequest.cc @@ -52,7 +52,7 @@ void RemoveTagsRequest::setTag(const std::vector &tag) { for(int dep1 = 0; dep1 != tag.size(); dep1++) { auto tagObj = tag.at(dep1); std::string tagObjStr = std::string("Tag") + "." + std::to_string(dep1 + 1); - setParameter(tagObjStr + ".value", tagObj.value); + setParameter(tagObjStr + ".Value", tagObj.value); setParameter(tagObjStr + ".Key", tagObj.key); } } diff --git a/ecs/src/model/RunCommandRequest.cc b/ecs/src/model/RunCommandRequest.cc index e558feb12..b6fcae137 100644 --- a/ecs/src/model/RunCommandRequest.cc +++ b/ecs/src/model/RunCommandRequest.cc @@ -142,6 +142,15 @@ void RunCommandRequest::setTimed(bool timed) { setParameter(std::string("Timed"), timed ? "true" : "false"); } +bool RunCommandRequest::getDryRun() const { + return dryRun_; +} + +void RunCommandRequest::setDryRun(bool dryRun) { + dryRun_ = dryRun; + setParameter(std::string("DryRun"), dryRun ? "true" : "false"); +} + std::string RunCommandRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; }