diff --git a/VERSION b/VERSION index dacbb1262..92c4fe5bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1447 \ No newline at end of file +1.36.1448 \ No newline at end of file diff --git a/ecs/CMakeLists.txt b/ecs/CMakeLists.txt index ea4b8025d..5148b4b08 100644 --- a/ecs/CMakeLists.txt +++ b/ecs/CMakeLists.txt @@ -391,6 +391,8 @@ set(ecs_public_header_model include/alibabacloud/ecs/model/DescribeRegionsResult.h include/alibabacloud/ecs/model/DescribeRenewalPriceRequest.h include/alibabacloud/ecs/model/DescribeRenewalPriceResult.h + include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeRequest.h + include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeResult.h include/alibabacloud/ecs/model/DescribeReservedInstancesRequest.h include/alibabacloud/ecs/model/DescribeReservedInstancesResult.h include/alibabacloud/ecs/model/DescribeResourceByTagsRequest.h @@ -589,6 +591,8 @@ set(ecs_public_header_model include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecResult.h include/alibabacloud/ecs/model/ModifyReservedInstanceAttributeRequest.h include/alibabacloud/ecs/model/ModifyReservedInstanceAttributeResult.h + include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeRequest.h + include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeResult.h include/alibabacloud/ecs/model/ModifyReservedInstancesRequest.h include/alibabacloud/ecs/model/ModifyReservedInstancesResult.h include/alibabacloud/ecs/model/ModifyRouterInterfaceAttributeRequest.h @@ -1082,6 +1086,8 @@ set(ecs_src src/model/DescribeRegionsResult.cc src/model/DescribeRenewalPriceRequest.cc src/model/DescribeRenewalPriceResult.cc + src/model/DescribeReservedInstanceAutoRenewAttributeRequest.cc + src/model/DescribeReservedInstanceAutoRenewAttributeResult.cc src/model/DescribeReservedInstancesRequest.cc src/model/DescribeReservedInstancesResult.cc src/model/DescribeResourceByTagsRequest.cc @@ -1280,6 +1286,8 @@ set(ecs_src src/model/ModifyPrepayInstanceSpecResult.cc src/model/ModifyReservedInstanceAttributeRequest.cc src/model/ModifyReservedInstanceAttributeResult.cc + src/model/ModifyReservedInstanceAutoRenewAttributeRequest.cc + src/model/ModifyReservedInstanceAutoRenewAttributeResult.cc src/model/ModifyReservedInstancesRequest.cc src/model/ModifyReservedInstancesResult.cc src/model/ModifyRouterInterfaceAttributeRequest.cc diff --git a/ecs/include/alibabacloud/ecs/EcsClient.h b/ecs/include/alibabacloud/ecs/EcsClient.h index 91cd4333f..4bc5cc2a9 100644 --- a/ecs/include/alibabacloud/ecs/EcsClient.h +++ b/ecs/include/alibabacloud/ecs/EcsClient.h @@ -392,6 +392,8 @@ #include "model/DescribeRegionsResult.h" #include "model/DescribeRenewalPriceRequest.h" #include "model/DescribeRenewalPriceResult.h" +#include "model/DescribeReservedInstanceAutoRenewAttributeRequest.h" +#include "model/DescribeReservedInstanceAutoRenewAttributeResult.h" #include "model/DescribeReservedInstancesRequest.h" #include "model/DescribeReservedInstancesResult.h" #include "model/DescribeResourceByTagsRequest.h" @@ -590,6 +592,8 @@ #include "model/ModifyPrepayInstanceSpecResult.h" #include "model/ModifyReservedInstanceAttributeRequest.h" #include "model/ModifyReservedInstanceAttributeResult.h" +#include "model/ModifyReservedInstanceAutoRenewAttributeRequest.h" +#include "model/ModifyReservedInstanceAutoRenewAttributeResult.h" #include "model/ModifyReservedInstancesRequest.h" #include "model/ModifyReservedInstancesResult.h" #include "model/ModifyRouterInterfaceAttributeRequest.h" @@ -1274,6 +1278,9 @@ namespace AlibabaCloud typedef Outcome DescribeRenewalPriceOutcome; typedef std::future DescribeRenewalPriceOutcomeCallable; typedef std::function&)> DescribeRenewalPriceAsyncHandler; + typedef Outcome DescribeReservedInstanceAutoRenewAttributeOutcome; + typedef std::future DescribeReservedInstanceAutoRenewAttributeOutcomeCallable; + typedef std::function&)> DescribeReservedInstanceAutoRenewAttributeAsyncHandler; typedef Outcome DescribeReservedInstancesOutcome; typedef std::future DescribeReservedInstancesOutcomeCallable; typedef std::function&)> DescribeReservedInstancesAsyncHandler; @@ -1571,6 +1578,9 @@ namespace AlibabaCloud typedef Outcome ModifyReservedInstanceAttributeOutcome; typedef std::future ModifyReservedInstanceAttributeOutcomeCallable; typedef std::function&)> ModifyReservedInstanceAttributeAsyncHandler; + typedef Outcome ModifyReservedInstanceAutoRenewAttributeOutcome; + typedef std::future ModifyReservedInstanceAutoRenewAttributeOutcomeCallable; + typedef std::function&)> ModifyReservedInstanceAutoRenewAttributeAsyncHandler; typedef Outcome ModifyReservedInstancesOutcome; typedef std::future ModifyReservedInstancesOutcomeCallable; typedef std::function&)> ModifyReservedInstancesAsyncHandler; @@ -2311,6 +2321,9 @@ namespace AlibabaCloud DescribeRenewalPriceOutcome describeRenewalPrice(const Model::DescribeRenewalPriceRequest &request)const; void describeRenewalPriceAsync(const Model::DescribeRenewalPriceRequest& request, const DescribeRenewalPriceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeRenewalPriceOutcomeCallable describeRenewalPriceCallable(const Model::DescribeRenewalPriceRequest& request) const; + DescribeReservedInstanceAutoRenewAttributeOutcome describeReservedInstanceAutoRenewAttribute(const Model::DescribeReservedInstanceAutoRenewAttributeRequest &request)const; + void describeReservedInstanceAutoRenewAttributeAsync(const Model::DescribeReservedInstanceAutoRenewAttributeRequest& request, const DescribeReservedInstanceAutoRenewAttributeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + DescribeReservedInstanceAutoRenewAttributeOutcomeCallable describeReservedInstanceAutoRenewAttributeCallable(const Model::DescribeReservedInstanceAutoRenewAttributeRequest& request) const; DescribeReservedInstancesOutcome describeReservedInstances(const Model::DescribeReservedInstancesRequest &request)const; void describeReservedInstancesAsync(const Model::DescribeReservedInstancesRequest& request, const DescribeReservedInstancesAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeReservedInstancesOutcomeCallable describeReservedInstancesCallable(const Model::DescribeReservedInstancesRequest& request) const; @@ -2608,6 +2621,9 @@ namespace AlibabaCloud ModifyReservedInstanceAttributeOutcome modifyReservedInstanceAttribute(const Model::ModifyReservedInstanceAttributeRequest &request)const; void modifyReservedInstanceAttributeAsync(const Model::ModifyReservedInstanceAttributeRequest& request, const ModifyReservedInstanceAttributeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ModifyReservedInstanceAttributeOutcomeCallable modifyReservedInstanceAttributeCallable(const Model::ModifyReservedInstanceAttributeRequest& request) const; + ModifyReservedInstanceAutoRenewAttributeOutcome modifyReservedInstanceAutoRenewAttribute(const Model::ModifyReservedInstanceAutoRenewAttributeRequest &request)const; + void modifyReservedInstanceAutoRenewAttributeAsync(const Model::ModifyReservedInstanceAutoRenewAttributeRequest& request, const ModifyReservedInstanceAutoRenewAttributeAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + ModifyReservedInstanceAutoRenewAttributeOutcomeCallable modifyReservedInstanceAutoRenewAttributeCallable(const Model::ModifyReservedInstanceAutoRenewAttributeRequest& request) const; ModifyReservedInstancesOutcome modifyReservedInstances(const Model::ModifyReservedInstancesRequest &request)const; void modifyReservedInstancesAsync(const Model::ModifyReservedInstancesRequest& request, const ModifyReservedInstancesAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ModifyReservedInstancesOutcomeCallable modifyReservedInstancesCallable(const Model::ModifyReservedInstancesRequest& request) const; diff --git a/ecs/include/alibabacloud/ecs/model/CreateActivationRequest.h b/ecs/include/alibabacloud/ecs/model/CreateActivationRequest.h index 28526d461..1f985ef97 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateActivationRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateActivationRequest.h @@ -28,6 +28,10 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT CreateActivationRequest : public RpcServiceRequest { public: + struct Tag { + std::string key; + std::string value; + }; CreateActivationRequest(); ~CreateActivationRequest(); long getResourceOwnerId() const; @@ -38,6 +42,8 @@ public: void setRegionId(const std::string ®ionId); int getInstanceCount() const; void setInstanceCount(int instanceCount); + std::vector getTag() const; + void setTag(const std::vector &tag); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -56,6 +62,7 @@ private: std::string description_; std::string regionId_; int instanceCount_; + std::vector tag_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h b/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h index cd760d0f8..c980494ff 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateAutoProvisioningGroupRequest.h @@ -62,6 +62,9 @@ public: int priority; std::string instanceType; double weightedCapacity; + int maxQuantity; + std::string instanceFamilyLevel; + std::string burstablePerformance; }; struct LaunchConfigurationTag { std::string key; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeActivationsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeActivationsRequest.h index 85096318b..c8f7b0c60 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeActivationsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeActivationsRequest.h @@ -28,6 +28,10 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT DescribeActivationsRequest : public RpcServiceRequest { public: + struct Tag { + std::string key; + std::string value; + }; DescribeActivationsRequest(); ~DescribeActivationsRequest(); long getResourceOwnerId() const; @@ -38,6 +42,8 @@ public: void setRegionId(const std::string ®ionId); long getPageSize() const; void setPageSize(long pageSize); + std::vector getTag() const; + void setTag(const std::vector &tag); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -54,6 +60,7 @@ private: long pageNumber_; std::string regionId_; long pageSize_; + std::vector tag_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeActivationsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeActivationsResult.h index 30ae52679..0a5a15773 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeActivationsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeActivationsResult.h @@ -34,6 +34,11 @@ namespace AlibabaCloud public: struct Activation { + struct Tag + { + std::string tagKey; + std::string tagValue; + }; std::string instanceName; int deregisteredCount; int instanceCount; @@ -44,6 +49,7 @@ namespace AlibabaCloud long timeToLiveInHours; bool disabled; std::string ipAddressRange; + std::vector tags; }; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h index 96f206c8f..802f9aa73 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsRequest.h @@ -38,6 +38,8 @@ public: void setDedicatedHostIds(const std::string &dedicatedHostIds); long getResourceOwnerId() const; void setResourceOwnerId(long resourceOwnerId); + std::string getSocketDetails() const; + void setSocketDetails(const std::string &socketDetails); int getPageNumber() const; void setPageNumber(int pageNumber); std::string getResourceGroupId() const; @@ -72,6 +74,7 @@ public: private: std::string dedicatedHostIds_; long resourceOwnerId_; + std::string socketDetails_; int pageNumber_; std::string resourceGroupId_; std::string lockReason_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h index 3d766ad8f..99992c756 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeDedicatedHostsResult.h @@ -36,9 +36,18 @@ namespace AlibabaCloud { struct Capacity { + struct SocketCapacity + { + int socketId; + float availableMemory; + float totalMemory; + int totalVcpu; + int availableVcpu; + }; std::string localStorageCategory; int availableVgpus; int totalVgpus; + std::vector socketCapacities; float availableMemory; float totalMemory; int availableVcpus; @@ -58,6 +67,7 @@ namespace AlibabaCloud struct Instance { std::string instanceId; + std::string socketId; std::string instanceType; }; struct OperationLock diff --git a/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesRequest.h index f8d6b0499..4c7a631bb 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesRequest.h @@ -28,6 +28,10 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT DescribeManagedInstancesRequest : public RpcServiceRequest { public: + struct Tag { + std::string key; + std::string value; + }; DescribeManagedInstancesRequest(); ~DescribeManagedInstancesRequest(); long getResourceOwnerId() const; @@ -38,6 +42,8 @@ public: void setRegionId(const std::string ®ionId); long getPageSize() const; void setPageSize(long pageSize); + std::vector getTag() const; + void setTag(const std::vector &tag); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -60,6 +66,7 @@ private: long pageNumber_; std::string regionId_; long pageSize_; + std::vector tag_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string osType_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesResult.h index 4ed4795dc..946957491 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeManagedInstancesResult.h @@ -34,6 +34,11 @@ namespace AlibabaCloud public: struct Instance { + struct Tag + { + std::string tagKey; + std::string tagValue; + }; std::string machineId; bool connected; std::string instanceId; @@ -48,6 +53,7 @@ namespace AlibabaCloud std::string internetIp; std::string osType; std::string lastInvokedTime; + std::vector tags; }; diff --git a/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h b/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h index d9c62ed8f..dfa55973d 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribePriceRequest.h @@ -93,6 +93,8 @@ public: void setRegionId(const std::string ®ionId); std::string getScope() const; void setScope(const std::string &scope); + std::string getSchedulerOptionsDedicatedHostId() const; + void setSchedulerOptionsDedicatedHostId(const std::string &schedulerOptionsDedicatedHostId); std::string getInstanceType() const; void setInstanceType(const std::string &instanceType); std::string getDedicatedHostType() const; @@ -154,6 +156,7 @@ private: std::string dataDisk4PerformanceLevel_; std::string regionId_; std::string scope_; + std::string schedulerOptionsDedicatedHostId_; std::string instanceType_; std::string dedicatedHostType_; std::string dataDisk2Category_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeRequest.h new file mode 100644 index 000000000..ccd117fd4 --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeRequest.h @@ -0,0 +1,57 @@ +/* + * 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_DESCRIBERESERVEDINSTANCEAUTORENEWATTRIBUTEREQUEST_H_ +#define ALIBABACLOUD_ECS_MODEL_DESCRIBERESERVEDINSTANCEAUTORENEWATTRIBUTEREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Ecs { +namespace Model { +class ALIBABACLOUD_ECS_EXPORT DescribeReservedInstanceAutoRenewAttributeRequest : public RpcServiceRequest { +public: + DescribeReservedInstanceAutoRenewAttributeRequest(); + ~DescribeReservedInstanceAutoRenewAttributeRequest(); + long getResourceOwnerId() const; + void setResourceOwnerId(long resourceOwnerId); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); + std::string getResourceOwnerAccount() const; + void setResourceOwnerAccount(const std::string &resourceOwnerAccount); + std::string getOwnerAccount() const; + void setOwnerAccount(const std::string &ownerAccount); + long getOwnerId() const; + void setOwnerId(long ownerId); + std::vector getReservedInstanceId() const; + void setReservedInstanceId(const std::vector &reservedInstanceId); + +private: + long resourceOwnerId_; + std::string regionId_; + std::string resourceOwnerAccount_; + std::string ownerAccount_; + long ownerId_; + std::vector reservedInstanceId_; +}; +} // namespace Model +} // namespace Ecs +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBERESERVEDINSTANCEAUTORENEWATTRIBUTEREQUEST_H_ diff --git a/ecs/include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeResult.h b/ecs/include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeResult.h new file mode 100644 index 000000000..e0d2c6ec4 --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/DescribeReservedInstanceAutoRenewAttributeResult.h @@ -0,0 +1,58 @@ +/* + * 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_DESCRIBERESERVEDINSTANCEAUTORENEWATTRIBUTERESULT_H_ +#define ALIBABACLOUD_ECS_MODEL_DESCRIBERESERVEDINSTANCEAUTORENEWATTRIBUTERESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT DescribeReservedInstanceAutoRenewAttributeResult : public ServiceResult + { + public: + struct ReservedInstanceRenewAttribute + { + std::string renewalStatus; + std::string reservedInstanceId; + int duration; + std::string periodUnit; + }; + + + DescribeReservedInstanceAutoRenewAttributeResult(); + explicit DescribeReservedInstanceAutoRenewAttributeResult(const std::string &payload); + ~DescribeReservedInstanceAutoRenewAttributeResult(); + std::vector getReservedInstanceRenewAttributes()const; + + protected: + void parse(const std::string &payload); + private: + std::vector reservedInstanceRenewAttributes_; + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_DESCRIBERESERVEDINSTANCEAUTORENEWATTRIBUTERESULT_H_ \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsRequest.h index 1bc5bc4ce..4cc57f01b 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsRequest.h @@ -28,6 +28,10 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT DescribeSendFileResultsRequest : public RpcServiceRequest { public: + struct Tag { + std::string key; + std::string value; + }; DescribeSendFileResultsRequest(); ~DescribeSendFileResultsRequest(); long getResourceOwnerId() const; @@ -40,6 +44,8 @@ public: void setRegionId(const std::string ®ionId); long getPageSize() const; void setPageSize(long pageSize); + std::vector getTag() const; + void setTag(const std::vector &tag); std::string getInvokeId() const; void setInvokeId(const std::string &invokeId); std::string getResourceOwnerAccount() const; @@ -59,6 +65,7 @@ private: std::string resourceGroupId_; std::string regionId_; long pageSize_; + std::vector tag_; std::string invokeId_; std::string resourceOwnerAccount_; std::string ownerAccount_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsResult.h index 2e346ace0..1c0b7e64f 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeSendFileResultsResult.h @@ -45,6 +45,11 @@ namespace AlibabaCloud std::string updateTime; std::string errorCode; }; + struct Tag + { + std::string tagKey; + std::string tagValue; + }; std::string fileMode; std::string invocationStatus; std::string overwrite; @@ -58,6 +63,7 @@ namespace AlibabaCloud std::string name; std::string content; std::string creationTime; + std::vector tags; std::string invokeId; }; diff --git a/ecs/include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeRequest.h b/ecs/include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeRequest.h new file mode 100644 index 000000000..1f75b2670 --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeRequest.h @@ -0,0 +1,66 @@ +/* + * 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_MODIFYRESERVEDINSTANCEAUTORENEWATTRIBUTEREQUEST_H_ +#define ALIBABACLOUD_ECS_MODEL_MODIFYRESERVEDINSTANCEAUTORENEWATTRIBUTEREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace Ecs { +namespace Model { +class ALIBABACLOUD_ECS_EXPORT ModifyReservedInstanceAutoRenewAttributeRequest : public RpcServiceRequest { +public: + ModifyReservedInstanceAutoRenewAttributeRequest(); + ~ModifyReservedInstanceAutoRenewAttributeRequest(); + long getResourceOwnerId() const; + void setResourceOwnerId(long resourceOwnerId); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); + std::string getRenewalStatus() const; + void setRenewalStatus(const std::string &renewalStatus); + int getPeriod() const; + void setPeriod(int period); + std::string getResourceOwnerAccount() const; + void setResourceOwnerAccount(const std::string &resourceOwnerAccount); + std::string getOwnerAccount() const; + void setOwnerAccount(const std::string &ownerAccount); + long getOwnerId() const; + void setOwnerId(long ownerId); + std::string getPeriodUnit() const; + void setPeriodUnit(const std::string &periodUnit); + std::vector getReservedInstanceId() const; + void setReservedInstanceId(const std::vector &reservedInstanceId); + +private: + long resourceOwnerId_; + std::string regionId_; + std::string renewalStatus_; + int period_; + std::string resourceOwnerAccount_; + std::string ownerAccount_; + long ownerId_; + std::string periodUnit_; + std::vector reservedInstanceId_; +}; +} // namespace Model +} // namespace Ecs +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYRESERVEDINSTANCEAUTORENEWATTRIBUTEREQUEST_H_ diff --git a/ecs/include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeResult.h b/ecs/include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeResult.h new file mode 100644 index 000000000..29f7dd8ce --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/ModifyReservedInstanceAutoRenewAttributeResult.h @@ -0,0 +1,49 @@ +/* + * 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_MODIFYRESERVEDINSTANCEAUTORENEWATTRIBUTERESULT_H_ +#define ALIBABACLOUD_ECS_MODEL_MODIFYRESERVEDINSTANCEAUTORENEWATTRIBUTERESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT ModifyReservedInstanceAutoRenewAttributeResult : public ServiceResult + { + public: + + + ModifyReservedInstanceAutoRenewAttributeResult(); + explicit ModifyReservedInstanceAutoRenewAttributeResult(const std::string &payload); + ~ModifyReservedInstanceAutoRenewAttributeResult(); + + protected: + void parse(const std::string &payload); + private: + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_MODIFYRESERVEDINSTANCEAUTORENEWATTRIBUTERESULT_H_ \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h b/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h index 9003f044a..905bbab77 100644 --- a/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h +++ b/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h @@ -39,6 +39,11 @@ public: struct ImageOptions { bool loginAsNonRoot; }; + struct SystemTag { + std::string key; + std::string value; + std::string scope; + }; struct Arn { std::string roleType; std::string rolearn; @@ -134,6 +139,8 @@ public: void setSpotInterruptionBehavior(const std::string &spotInterruptionBehavior); int getNetworkInterfaceQueueNumber() const; void setNetworkInterfaceQueueNumber(int networkInterfaceQueueNumber); + std::vector getSystemTag() const; + void setSystemTag(const std::vector &systemTag); std::string getIoOptimized() const; void setIoOptimized(const std::string &ioOptimized); std::string getSecurityGroupId() const; @@ -283,6 +290,7 @@ private: std::string imageId_; std::string spotInterruptionBehavior_; int networkInterfaceQueueNumber_; + std::vector systemTag_; std::string ioOptimized_; std::string securityGroupId_; bool hibernationOptionsConfigured_; diff --git a/ecs/include/alibabacloud/ecs/model/SendFileRequest.h b/ecs/include/alibabacloud/ecs/model/SendFileRequest.h index 263b71da1..80c748c37 100644 --- a/ecs/include/alibabacloud/ecs/model/SendFileRequest.h +++ b/ecs/include/alibabacloud/ecs/model/SendFileRequest.h @@ -28,6 +28,10 @@ namespace Ecs { namespace Model { class ALIBABACLOUD_ECS_EXPORT SendFileRequest : public RpcServiceRequest { public: + struct Tag { + std::string key; + std::string value; + }; SendFileRequest(); ~SendFileRequest(); long getResourceOwnerId() const; @@ -44,6 +48,8 @@ public: void setRegionId(const std::string ®ionId); std::string getFileOwner() const; void setFileOwner(const std::string &fileOwner); + std::vector getTag() const; + void setTag(const std::vector &tag); bool getOverwrite() const; void setOverwrite(bool overwrite); std::string getResourceOwnerAccount() const; @@ -73,6 +79,7 @@ private: std::string resourceGroupId_; std::string regionId_; std::string fileOwner_; + std::vector tag_; bool overwrite_; std::string resourceOwnerAccount_; std::string ownerAccount_; diff --git a/ecs/src/EcsClient.cc b/ecs/src/EcsClient.cc index 311a2cd39..fe6dca85c 100644 --- a/ecs/src/EcsClient.cc +++ b/ecs/src/EcsClient.cc @@ -31,21 +31,21 @@ EcsClient::EcsClient(const Credentials &credentials, const ClientConfiguration & RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "ecs"); } EcsClient::EcsClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "ecs"); } EcsClient::EcsClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "ecs"); } EcsClient::~EcsClient() @@ -6711,6 +6711,42 @@ EcsClient::DescribeRenewalPriceOutcomeCallable EcsClient::describeRenewalPriceCa return task->get_future(); } +EcsClient::DescribeReservedInstanceAutoRenewAttributeOutcome EcsClient::describeReservedInstanceAutoRenewAttribute(const DescribeReservedInstanceAutoRenewAttributeRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return DescribeReservedInstanceAutoRenewAttributeOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return DescribeReservedInstanceAutoRenewAttributeOutcome(DescribeReservedInstanceAutoRenewAttributeResult(outcome.result())); + else + return DescribeReservedInstanceAutoRenewAttributeOutcome(outcome.error()); +} + +void EcsClient::describeReservedInstanceAutoRenewAttributeAsync(const DescribeReservedInstanceAutoRenewAttributeRequest& request, const DescribeReservedInstanceAutoRenewAttributeAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, describeReservedInstanceAutoRenewAttribute(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EcsClient::DescribeReservedInstanceAutoRenewAttributeOutcomeCallable EcsClient::describeReservedInstanceAutoRenewAttributeCallable(const DescribeReservedInstanceAutoRenewAttributeRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->describeReservedInstanceAutoRenewAttribute(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EcsClient::DescribeReservedInstancesOutcome EcsClient::describeReservedInstances(const DescribeReservedInstancesRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -10275,6 +10311,42 @@ EcsClient::ModifyReservedInstanceAttributeOutcomeCallable EcsClient::modifyReser return task->get_future(); } +EcsClient::ModifyReservedInstanceAutoRenewAttributeOutcome EcsClient::modifyReservedInstanceAutoRenewAttribute(const ModifyReservedInstanceAutoRenewAttributeRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return ModifyReservedInstanceAutoRenewAttributeOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return ModifyReservedInstanceAutoRenewAttributeOutcome(ModifyReservedInstanceAutoRenewAttributeResult(outcome.result())); + else + return ModifyReservedInstanceAutoRenewAttributeOutcome(outcome.error()); +} + +void EcsClient::modifyReservedInstanceAutoRenewAttributeAsync(const ModifyReservedInstanceAutoRenewAttributeRequest& request, const ModifyReservedInstanceAutoRenewAttributeAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, modifyReservedInstanceAutoRenewAttribute(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EcsClient::ModifyReservedInstanceAutoRenewAttributeOutcomeCallable EcsClient::modifyReservedInstanceAutoRenewAttributeCallable(const ModifyReservedInstanceAutoRenewAttributeRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->modifyReservedInstanceAutoRenewAttribute(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EcsClient::ModifyReservedInstancesOutcome EcsClient::modifyReservedInstances(const ModifyReservedInstancesRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/ecs/src/model/CreateActivationRequest.cc b/ecs/src/model/CreateActivationRequest.cc index 89f19fec2..958e52185 100644 --- a/ecs/src/model/CreateActivationRequest.cc +++ b/ecs/src/model/CreateActivationRequest.cc @@ -61,6 +61,20 @@ void CreateActivationRequest::setInstanceCount(int instanceCount) { setParameter(std::string("InstanceCount"), std::to_string(instanceCount)); } +std::vector CreateActivationRequest::getTag() const { + return tag_; +} + +void CreateActivationRequest::setTag(const std::vector &tag) { + tag_ = 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 + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + std::string CreateActivationRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/ecs/src/model/CreateAutoProvisioningGroupRequest.cc b/ecs/src/model/CreateAutoProvisioningGroupRequest.cc index 84c8754c0..8b72fe368 100644 --- a/ecs/src/model/CreateAutoProvisioningGroupRequest.cc +++ b/ecs/src/model/CreateAutoProvisioningGroupRequest.cc @@ -435,6 +435,9 @@ void CreateAutoProvisioningGroupRequest::setLaunchTemplateConfig(const std::vect setParameter(launchTemplateConfigObjStr + ".Priority", std::to_string(launchTemplateConfigObj.priority)); setParameter(launchTemplateConfigObjStr + ".InstanceType", launchTemplateConfigObj.instanceType); setParameter(launchTemplateConfigObjStr + ".WeightedCapacity", std::to_string(launchTemplateConfigObj.weightedCapacity)); + setParameter(launchTemplateConfigObjStr + ".MaxQuantity", std::to_string(launchTemplateConfigObj.maxQuantity)); + setParameter(launchTemplateConfigObjStr + ".InstanceFamilyLevel", launchTemplateConfigObj.instanceFamilyLevel); + setParameter(launchTemplateConfigObjStr + ".BurstablePerformance", launchTemplateConfigObj.burstablePerformance); } } diff --git a/ecs/src/model/DescribeActivationsRequest.cc b/ecs/src/model/DescribeActivationsRequest.cc index 00e30cf4c..16a706211 100644 --- a/ecs/src/model/DescribeActivationsRequest.cc +++ b/ecs/src/model/DescribeActivationsRequest.cc @@ -61,6 +61,20 @@ void DescribeActivationsRequest::setPageSize(long pageSize) { setParameter(std::string("PageSize"), std::to_string(pageSize)); } +std::vector DescribeActivationsRequest::getTag() const { + return tag_; +} + +void DescribeActivationsRequest::setTag(const std::vector &tag) { + tag_ = 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 + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + std::string DescribeActivationsRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/ecs/src/model/DescribeActivationsResult.cc b/ecs/src/model/DescribeActivationsResult.cc index 270e47d09..b9a604645 100644 --- a/ecs/src/model/DescribeActivationsResult.cc +++ b/ecs/src/model/DescribeActivationsResult.cc @@ -63,6 +63,16 @@ void DescribeActivationsResult::parse(const std::string &payload) activationListObject.timeToLiveInHours = std::stol(valueActivationListActivation["TimeToLiveInHours"].asString()); if(!valueActivationListActivation["ActivationId"].isNull()) activationListObject.activationId = valueActivationListActivation["ActivationId"].asString(); + auto allTagsNode = valueActivationListActivation["Tags"]["Tag"]; + for (auto valueActivationListActivationTagsTag : allTagsNode) + { + Activation::Tag tagsObject; + if(!valueActivationListActivationTagsTag["TagKey"].isNull()) + tagsObject.tagKey = valueActivationListActivationTagsTag["TagKey"].asString(); + if(!valueActivationListActivationTagsTag["TagValue"].isNull()) + tagsObject.tagValue = valueActivationListActivationTagsTag["TagValue"].asString(); + activationListObject.tags.push_back(tagsObject); + } activationList_.push_back(activationListObject); } if(!value["PageSize"].isNull()) diff --git a/ecs/src/model/DescribeDedicatedHostsRequest.cc b/ecs/src/model/DescribeDedicatedHostsRequest.cc index 16072077e..50b7320d9 100644 --- a/ecs/src/model/DescribeDedicatedHostsRequest.cc +++ b/ecs/src/model/DescribeDedicatedHostsRequest.cc @@ -43,6 +43,15 @@ void DescribeDedicatedHostsRequest::setResourceOwnerId(long resourceOwnerId) { setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); } +std::string DescribeDedicatedHostsRequest::getSocketDetails() const { + return socketDetails_; +} + +void DescribeDedicatedHostsRequest::setSocketDetails(const std::string &socketDetails) { + socketDetails_ = socketDetails; + setParameter(std::string("SocketDetails"), socketDetails); +} + int DescribeDedicatedHostsRequest::getPageNumber() const { return pageNumber_; } diff --git a/ecs/src/model/DescribeDedicatedHostsResult.cc b/ecs/src/model/DescribeDedicatedHostsResult.cc index d7d664f26..4b3b7a6d6 100644 --- a/ecs/src/model/DescribeDedicatedHostsResult.cc +++ b/ecs/src/model/DescribeDedicatedHostsResult.cc @@ -97,6 +97,8 @@ void DescribeDedicatedHostsResult::parse(const std::string &payload) instancesObject.instanceType = valueDedicatedHostsDedicatedHostInstancesInstance["InstanceType"].asString(); if(!valueDedicatedHostsDedicatedHostInstancesInstance["InstanceId"].isNull()) instancesObject.instanceId = valueDedicatedHostsDedicatedHostInstancesInstance["InstanceId"].asString(); + if(!valueDedicatedHostsDedicatedHostInstancesInstance["SocketId"].isNull()) + instancesObject.socketId = valueDedicatedHostsDedicatedHostInstancesInstance["SocketId"].asString(); dedicatedHostsObject.instances.push_back(instancesObject); } auto allOperationLocksNode = valueDedicatedHostsDedicatedHost["OperationLocks"]["OperationLock"]; @@ -136,6 +138,22 @@ void DescribeDedicatedHostsResult::parse(const std::string &payload) dedicatedHostsObject.capacity.availableVcpus = std::stoi(capacityNode["AvailableVcpus"].asString()); if(!capacityNode["AvailableVgpus"].isNull()) dedicatedHostsObject.capacity.availableVgpus = std::stoi(capacityNode["AvailableVgpus"].asString()); + auto allSocketCapacitiesNode = capacityNode["SocketCapacities"]["SocketCapacity"]; + for (auto capacityNodeSocketCapacitiesSocketCapacity : allSocketCapacitiesNode) + { + DedicatedHost::Capacity::SocketCapacity socketCapacityObject; + if(!capacityNodeSocketCapacitiesSocketCapacity["SocketId"].isNull()) + socketCapacityObject.socketId = std::stoi(capacityNodeSocketCapacitiesSocketCapacity["SocketId"].asString()); + if(!capacityNodeSocketCapacitiesSocketCapacity["AvailableMemory"].isNull()) + socketCapacityObject.availableMemory = std::stof(capacityNodeSocketCapacitiesSocketCapacity["AvailableMemory"].asString()); + if(!capacityNodeSocketCapacitiesSocketCapacity["TotalMemory"].isNull()) + socketCapacityObject.totalMemory = std::stof(capacityNodeSocketCapacitiesSocketCapacity["TotalMemory"].asString()); + if(!capacityNodeSocketCapacitiesSocketCapacity["AvailableVcpu"].isNull()) + socketCapacityObject.availableVcpu = std::stoi(capacityNodeSocketCapacitiesSocketCapacity["AvailableVcpu"].asString()); + if(!capacityNodeSocketCapacitiesSocketCapacity["TotalVcpu"].isNull()) + socketCapacityObject.totalVcpu = std::stoi(capacityNodeSocketCapacitiesSocketCapacity["TotalVcpu"].asString()); + dedicatedHostsObject.capacity.socketCapacities.push_back(socketCapacityObject); + } auto networkAttributesNode = value["NetworkAttributes"]; if(!networkAttributesNode["UdpTimeout"].isNull()) dedicatedHostsObject.networkAttributes.udpTimeout = std::stoi(networkAttributesNode["UdpTimeout"].asString()); diff --git a/ecs/src/model/DescribeManagedInstancesRequest.cc b/ecs/src/model/DescribeManagedInstancesRequest.cc index 47bd3e670..d906518d7 100644 --- a/ecs/src/model/DescribeManagedInstancesRequest.cc +++ b/ecs/src/model/DescribeManagedInstancesRequest.cc @@ -61,6 +61,20 @@ void DescribeManagedInstancesRequest::setPageSize(long pageSize) { setParameter(std::string("PageSize"), std::to_string(pageSize)); } +std::vector DescribeManagedInstancesRequest::getTag() const { + return tag_; +} + +void DescribeManagedInstancesRequest::setTag(const std::vector &tag) { + tag_ = 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 + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + std::string DescribeManagedInstancesRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/ecs/src/model/DescribeManagedInstancesResult.cc b/ecs/src/model/DescribeManagedInstancesResult.cc index 184ba81ba..6a99b9e50 100644 --- a/ecs/src/model/DescribeManagedInstancesResult.cc +++ b/ecs/src/model/DescribeManagedInstancesResult.cc @@ -71,6 +71,16 @@ void DescribeManagedInstancesResult::parse(const std::string &payload) instancesObject.invocationCount = std::stol(valueInstancesInstance["InvocationCount"].asString()); if(!valueInstancesInstance["MachineId"].isNull()) instancesObject.machineId = valueInstancesInstance["MachineId"].asString(); + auto allTagsNode = valueInstancesInstance["Tags"]["Tag"]; + for (auto valueInstancesInstanceTagsTag : allTagsNode) + { + Instance::Tag tagsObject; + if(!valueInstancesInstanceTagsTag["TagKey"].isNull()) + tagsObject.tagKey = valueInstancesInstanceTagsTag["TagKey"].asString(); + if(!valueInstancesInstanceTagsTag["TagValue"].isNull()) + tagsObject.tagValue = valueInstancesInstanceTagsTag["TagValue"].asString(); + instancesObject.tags.push_back(tagsObject); + } instances_.push_back(instancesObject); } if(!value["PageSize"].isNull()) diff --git a/ecs/src/model/DescribePriceRequest.cc b/ecs/src/model/DescribePriceRequest.cc index d971d1ecc..5975e85d3 100644 --- a/ecs/src/model/DescribePriceRequest.cc +++ b/ecs/src/model/DescribePriceRequest.cc @@ -285,6 +285,15 @@ void DescribePriceRequest::setScope(const std::string &scope) { setParameter(std::string("Scope"), scope); } +std::string DescribePriceRequest::getSchedulerOptionsDedicatedHostId() const { + return schedulerOptionsDedicatedHostId_; +} + +void DescribePriceRequest::setSchedulerOptionsDedicatedHostId(const std::string &schedulerOptionsDedicatedHostId) { + schedulerOptionsDedicatedHostId_ = schedulerOptionsDedicatedHostId; + setParameter(std::string("SchedulerOptions.DedicatedHostId"), schedulerOptionsDedicatedHostId); +} + std::string DescribePriceRequest::getInstanceType() const { return instanceType_; } diff --git a/ecs/src/model/DescribeReservedInstanceAutoRenewAttributeRequest.cc b/ecs/src/model/DescribeReservedInstanceAutoRenewAttributeRequest.cc new file mode 100644 index 000000000..fdd3326a0 --- /dev/null +++ b/ecs/src/model/DescribeReservedInstanceAutoRenewAttributeRequest.cc @@ -0,0 +1,80 @@ +/* + * 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::DescribeReservedInstanceAutoRenewAttributeRequest; + +DescribeReservedInstanceAutoRenewAttributeRequest::DescribeReservedInstanceAutoRenewAttributeRequest() + : RpcServiceRequest("ecs", "2014-05-26", "DescribeReservedInstanceAutoRenewAttribute") { + setMethod(HttpRequest::Method::Post); +} + +DescribeReservedInstanceAutoRenewAttributeRequest::~DescribeReservedInstanceAutoRenewAttributeRequest() {} + +long DescribeReservedInstanceAutoRenewAttributeRequest::getResourceOwnerId() const { + return resourceOwnerId_; +} + +void DescribeReservedInstanceAutoRenewAttributeRequest::setResourceOwnerId(long resourceOwnerId) { + resourceOwnerId_ = resourceOwnerId; + setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); +} + +std::string DescribeReservedInstanceAutoRenewAttributeRequest::getRegionId() const { + return regionId_; +} + +void DescribeReservedInstanceAutoRenewAttributeRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + +std::string DescribeReservedInstanceAutoRenewAttributeRequest::getResourceOwnerAccount() const { + return resourceOwnerAccount_; +} + +void DescribeReservedInstanceAutoRenewAttributeRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) { + resourceOwnerAccount_ = resourceOwnerAccount; + setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount); +} + +std::string DescribeReservedInstanceAutoRenewAttributeRequest::getOwnerAccount() const { + return ownerAccount_; +} + +void DescribeReservedInstanceAutoRenewAttributeRequest::setOwnerAccount(const std::string &ownerAccount) { + ownerAccount_ = ownerAccount; + setParameter(std::string("OwnerAccount"), ownerAccount); +} + +long DescribeReservedInstanceAutoRenewAttributeRequest::getOwnerId() const { + return ownerId_; +} + +void DescribeReservedInstanceAutoRenewAttributeRequest::setOwnerId(long ownerId) { + ownerId_ = ownerId; + setParameter(std::string("OwnerId"), std::to_string(ownerId)); +} + +std::vector DescribeReservedInstanceAutoRenewAttributeRequest::getReservedInstanceId() const { + return reservedInstanceId_; +} + +void DescribeReservedInstanceAutoRenewAttributeRequest::setReservedInstanceId(const std::vector &reservedInstanceId) { + reservedInstanceId_ = reservedInstanceId; +} + diff --git a/ecs/src/model/DescribeReservedInstanceAutoRenewAttributeResult.cc b/ecs/src/model/DescribeReservedInstanceAutoRenewAttributeResult.cc new file mode 100644 index 000000000..a4dd029fb --- /dev/null +++ b/ecs/src/model/DescribeReservedInstanceAutoRenewAttributeResult.cc @@ -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. + */ + +#include +#include + +using namespace AlibabaCloud::Ecs; +using namespace AlibabaCloud::Ecs::Model; + +DescribeReservedInstanceAutoRenewAttributeResult::DescribeReservedInstanceAutoRenewAttributeResult() : + ServiceResult() +{} + +DescribeReservedInstanceAutoRenewAttributeResult::DescribeReservedInstanceAutoRenewAttributeResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +DescribeReservedInstanceAutoRenewAttributeResult::~DescribeReservedInstanceAutoRenewAttributeResult() +{} + +void DescribeReservedInstanceAutoRenewAttributeResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + auto allReservedInstanceRenewAttributesNode = value["ReservedInstanceRenewAttributes"]["ReservedInstanceRenewAttribute"]; + for (auto valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute : allReservedInstanceRenewAttributesNode) + { + ReservedInstanceRenewAttribute reservedInstanceRenewAttributesObject; + if(!valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["PeriodUnit"].isNull()) + reservedInstanceRenewAttributesObject.periodUnit = valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["PeriodUnit"].asString(); + if(!valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["Duration"].isNull()) + reservedInstanceRenewAttributesObject.duration = std::stoi(valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["Duration"].asString()); + if(!valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["ReservedInstanceId"].isNull()) + reservedInstanceRenewAttributesObject.reservedInstanceId = valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["ReservedInstanceId"].asString(); + if(!valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["RenewalStatus"].isNull()) + reservedInstanceRenewAttributesObject.renewalStatus = valueReservedInstanceRenewAttributesReservedInstanceRenewAttribute["RenewalStatus"].asString(); + reservedInstanceRenewAttributes_.push_back(reservedInstanceRenewAttributesObject); + } + +} + +std::vector DescribeReservedInstanceAutoRenewAttributeResult::getReservedInstanceRenewAttributes()const +{ + return reservedInstanceRenewAttributes_; +} + diff --git a/ecs/src/model/DescribeSendFileResultsRequest.cc b/ecs/src/model/DescribeSendFileResultsRequest.cc index 900ee44fb..846b2ddfc 100644 --- a/ecs/src/model/DescribeSendFileResultsRequest.cc +++ b/ecs/src/model/DescribeSendFileResultsRequest.cc @@ -70,6 +70,20 @@ void DescribeSendFileResultsRequest::setPageSize(long pageSize) { setParameter(std::string("PageSize"), std::to_string(pageSize)); } +std::vector DescribeSendFileResultsRequest::getTag() const { + return tag_; +} + +void DescribeSendFileResultsRequest::setTag(const std::vector &tag) { + tag_ = 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 + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + std::string DescribeSendFileResultsRequest::getInvokeId() const { return invokeId_; } diff --git a/ecs/src/model/DescribeSendFileResultsResult.cc b/ecs/src/model/DescribeSendFileResultsResult.cc index ce2b9f00e..2a7f23e52 100644 --- a/ecs/src/model/DescribeSendFileResultsResult.cc +++ b/ecs/src/model/DescribeSendFileResultsResult.cc @@ -91,6 +91,16 @@ void DescribeSendFileResultsResult::parse(const std::string &payload) invokeInstancesObject.instanceId = valueInvocationsInvocationInvokeInstancesInvokeInstance["InstanceId"].asString(); invocationsObject.invokeInstances.push_back(invokeInstancesObject); } + auto allTagsNode = valueInvocationsInvocation["Tags"]["Tag"]; + for (auto valueInvocationsInvocationTagsTag : allTagsNode) + { + Invocation::Tag tagsObject; + if(!valueInvocationsInvocationTagsTag["TagKey"].isNull()) + tagsObject.tagKey = valueInvocationsInvocationTagsTag["TagKey"].asString(); + if(!valueInvocationsInvocationTagsTag["TagValue"].isNull()) + tagsObject.tagValue = valueInvocationsInvocationTagsTag["TagValue"].asString(); + invocationsObject.tags.push_back(tagsObject); + } invocations_.push_back(invocationsObject); } if(!value["PageSize"].isNull()) diff --git a/ecs/src/model/ModifyReservedInstanceAutoRenewAttributeRequest.cc b/ecs/src/model/ModifyReservedInstanceAutoRenewAttributeRequest.cc new file mode 100644 index 000000000..324a0bdb9 --- /dev/null +++ b/ecs/src/model/ModifyReservedInstanceAutoRenewAttributeRequest.cc @@ -0,0 +1,107 @@ +/* + * 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::ModifyReservedInstanceAutoRenewAttributeRequest; + +ModifyReservedInstanceAutoRenewAttributeRequest::ModifyReservedInstanceAutoRenewAttributeRequest() + : RpcServiceRequest("ecs", "2014-05-26", "ModifyReservedInstanceAutoRenewAttribute") { + setMethod(HttpRequest::Method::Post); +} + +ModifyReservedInstanceAutoRenewAttributeRequest::~ModifyReservedInstanceAutoRenewAttributeRequest() {} + +long ModifyReservedInstanceAutoRenewAttributeRequest::getResourceOwnerId() const { + return resourceOwnerId_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setResourceOwnerId(long resourceOwnerId) { + resourceOwnerId_ = resourceOwnerId; + setParameter(std::string("ResourceOwnerId"), std::to_string(resourceOwnerId)); +} + +std::string ModifyReservedInstanceAutoRenewAttributeRequest::getRegionId() const { + return regionId_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + +std::string ModifyReservedInstanceAutoRenewAttributeRequest::getRenewalStatus() const { + return renewalStatus_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setRenewalStatus(const std::string &renewalStatus) { + renewalStatus_ = renewalStatus; + setParameter(std::string("RenewalStatus"), renewalStatus); +} + +int ModifyReservedInstanceAutoRenewAttributeRequest::getPeriod() const { + return period_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setPeriod(int period) { + period_ = period; + setParameter(std::string("Period"), std::to_string(period)); +} + +std::string ModifyReservedInstanceAutoRenewAttributeRequest::getResourceOwnerAccount() const { + return resourceOwnerAccount_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setResourceOwnerAccount(const std::string &resourceOwnerAccount) { + resourceOwnerAccount_ = resourceOwnerAccount; + setParameter(std::string("ResourceOwnerAccount"), resourceOwnerAccount); +} + +std::string ModifyReservedInstanceAutoRenewAttributeRequest::getOwnerAccount() const { + return ownerAccount_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setOwnerAccount(const std::string &ownerAccount) { + ownerAccount_ = ownerAccount; + setParameter(std::string("OwnerAccount"), ownerAccount); +} + +long ModifyReservedInstanceAutoRenewAttributeRequest::getOwnerId() const { + return ownerId_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setOwnerId(long ownerId) { + ownerId_ = ownerId; + setParameter(std::string("OwnerId"), std::to_string(ownerId)); +} + +std::string ModifyReservedInstanceAutoRenewAttributeRequest::getPeriodUnit() const { + return periodUnit_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setPeriodUnit(const std::string &periodUnit) { + periodUnit_ = periodUnit; + setParameter(std::string("PeriodUnit"), periodUnit); +} + +std::vector ModifyReservedInstanceAutoRenewAttributeRequest::getReservedInstanceId() const { + return reservedInstanceId_; +} + +void ModifyReservedInstanceAutoRenewAttributeRequest::setReservedInstanceId(const std::vector &reservedInstanceId) { + reservedInstanceId_ = reservedInstanceId; +} + diff --git a/ecs/src/model/ModifyReservedInstanceAutoRenewAttributeResult.cc b/ecs/src/model/ModifyReservedInstanceAutoRenewAttributeResult.cc new file mode 100644 index 000000000..32f359a44 --- /dev/null +++ b/ecs/src/model/ModifyReservedInstanceAutoRenewAttributeResult.cc @@ -0,0 +1,44 @@ +/* + * 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; + +ModifyReservedInstanceAutoRenewAttributeResult::ModifyReservedInstanceAutoRenewAttributeResult() : + ServiceResult() +{} + +ModifyReservedInstanceAutoRenewAttributeResult::ModifyReservedInstanceAutoRenewAttributeResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +ModifyReservedInstanceAutoRenewAttributeResult::~ModifyReservedInstanceAutoRenewAttributeResult() +{} + +void ModifyReservedInstanceAutoRenewAttributeResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + +} + diff --git a/ecs/src/model/RunInstancesRequest.cc b/ecs/src/model/RunInstancesRequest.cc index 15d40772c..d02680160 100644 --- a/ecs/src/model/RunInstancesRequest.cc +++ b/ecs/src/model/RunInstancesRequest.cc @@ -273,6 +273,21 @@ void RunInstancesRequest::setNetworkInterfaceQueueNumber(int networkInterfaceQue setParameter(std::string("NetworkInterfaceQueueNumber"), std::to_string(networkInterfaceQueueNumber)); } +std::vector RunInstancesRequest::getSystemTag() const { + return systemTag_; +} + +void RunInstancesRequest::setSystemTag(const std::vector &systemTag) { + systemTag_ = systemTag; + for(int dep1 = 0; dep1 != systemTag.size(); dep1++) { + auto systemTagObj = systemTag.at(dep1); + std::string systemTagObjStr = std::string("SystemTag") + "." + std::to_string(dep1 + 1); + setParameter(systemTagObjStr + ".Key", systemTagObj.key); + setParameter(systemTagObjStr + ".Value", systemTagObj.value); + setParameter(systemTagObjStr + ".Scope", systemTagObj.scope); + } +} + std::string RunInstancesRequest::getIoOptimized() const { return ioOptimized_; } diff --git a/ecs/src/model/SendFileRequest.cc b/ecs/src/model/SendFileRequest.cc index 4bd6ccb59..9f1fc9a77 100644 --- a/ecs/src/model/SendFileRequest.cc +++ b/ecs/src/model/SendFileRequest.cc @@ -88,6 +88,20 @@ void SendFileRequest::setFileOwner(const std::string &fileOwner) { setParameter(std::string("FileOwner"), fileOwner); } +std::vector SendFileRequest::getTag() const { + return tag_; +} + +void SendFileRequest::setTag(const std::vector &tag) { + tag_ = 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 + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + bool SendFileRequest::getOverwrite() const { return overwrite_; }