diff --git a/CHANGELOG b/CHANGELOG index a2c572a3b..0600c75ac 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2021-08-19 Version: 1.36.856 +- Add SupportSessionManager for DescribeCloudAssistantStatus. + 2021-08-19 Version: 1.36.855 - Support Round and Interval for ApplyNodes API. diff --git a/VERSION b/VERSION index c585b2416..3a0eb8040 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.855 \ No newline at end of file +1.36.856 \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/CreateAutoSnapshotPolicyRequest.h b/ecs/include/alibabacloud/ecs/model/CreateAutoSnapshotPolicyRequest.h index 7df05f552..18c31ff30 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateAutoSnapshotPolicyRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateAutoSnapshotPolicyRequest.h @@ -49,6 +49,8 @@ namespace AlibabaCloud void setTimePoints(const std::string& timePoints); std::string getRepeatWeekdays()const; void setRepeatWeekdays(const std::string& repeatWeekdays); + std::string getResourceGroupId()const; + void setResourceGroupId(const std::string& resourceGroupId); std::string getRegionId()const; void setRegionId(const std::string& regionId); std::vector getTag()const; @@ -71,6 +73,7 @@ namespace AlibabaCloud int copiedSnapshotsRetentionDays_; std::string timePoints_; std::string repeatWeekdays_; + std::string resourceGroupId_; std::string regionId_; std::vector tag_; bool enableCrossRegionCopy_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeCloudAssistantStatusResult.h b/ecs/include/alibabacloud/ecs/model/DescribeCloudAssistantStatusResult.h index 1b3c7ffd4..7994b6bcf 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeCloudAssistantStatusResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeCloudAssistantStatusResult.h @@ -35,9 +35,10 @@ namespace AlibabaCloud struct InstanceCloudAssistantStatus { std::string cloudAssistantVersion; + bool supportSessionManager; std::string instanceId; - std::string oSType; long invocationCount; + std::string oSType; std::string cloudAssistantStatus; std::string lastHeartbeatTime; std::string lastInvokedTime; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h index 52a74471a..04dfd3b36 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesRequest.h @@ -39,6 +39,8 @@ namespace AlibabaCloud void setResourceOwnerId(long resourceOwnerId); std::vector getInstanceTypes()const; void setInstanceTypes(const std::vector& instanceTypes); + std::string getNextToken()const; + void setNextToken(const std::string& nextToken); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -47,14 +49,18 @@ namespace AlibabaCloud void setInstanceTypeFamily(const std::string& instanceTypeFamily); long getOwnerId()const; void setOwnerId(long ownerId); + long getMaxResults()const; + void setMaxResults(long maxResults); private: long resourceOwnerId_; std::vector instanceTypes_; + std::string nextToken_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string instanceTypeFamily_; long ownerId_; + long maxResults_; }; } diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h index 16414ba84..7bf4d06df 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceTypesResult.h @@ -53,8 +53,8 @@ namespace AlibabaCloud float memorySize; int maximumQueueNumberPerEni; int eniIpv6AddressQuantity; - int cpuCoreCount; int eniTotalQuantity; + int cpuCoreCount; int initialCredit; int eniQuantity; int gPUAmount; @@ -69,11 +69,13 @@ namespace AlibabaCloud DescribeInstanceTypesResult(); explicit DescribeInstanceTypesResult(const std::string &payload); ~DescribeInstanceTypesResult(); + std::string getNextToken()const; std::vector getInstanceTypes()const; protected: void parse(const std::string &payload); private: + std::string nextToken_; std::vector instanceTypes_; }; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsRequest.h index 05bba4d0e..cd3da8675 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsRequest.h @@ -30,6 +30,12 @@ namespace AlibabaCloud { class ALIBABACLOUD_ECS_EXPORT DescribeStorageCapacityUnitsRequest : public RpcServiceRequest { + public: + struct Tag + { + std::string key; + std::string value; + }; public: DescribeStorageCapacityUnitsRequest(); @@ -47,6 +53,8 @@ namespace AlibabaCloud void setRegionId(const std::string& regionId); int getPageSize()const; void setPageSize(int 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; @@ -55,10 +63,10 @@ namespace AlibabaCloud void setOwnerId(long ownerId); std::string getName()const; void setName(const std::string& name); - std::vector getStatus()const; - void setStatus(const std::vector& status); std::string getAllocationType()const; void setAllocationType(const std::string& allocationType); + std::vector getStatus()const; + void setStatus(const std::vector& status); private: long resourceOwnerId_; @@ -67,12 +75,13 @@ namespace AlibabaCloud std::vector storageCapacityUnitId_; std::string regionId_; int pageSize_; + std::vector tag_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; std::string name_; - std::vector status_; std::string allocationType_; + std::vector status_; }; } diff --git a/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsResult.h index 6853e5d38..8f857246e 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeStorageCapacityUnitsResult.h @@ -34,15 +34,21 @@ namespace AlibabaCloud public: struct StorageCapacityUnit { + struct Tag + { + std::string tagKey; + std::string tagValue; + }; std::string status; std::string description; std::string allocationStatus; - std::string storageCapacityUnitId; int capacity; + std::string storageCapacityUnitId; std::string expiredTime; std::string creationTime; std::string startTime; std::string regionId; + std::vector tags; std::string name; }; diff --git a/ecs/include/alibabacloud/ecs/model/PurchaseStorageCapacityUnitRequest.h b/ecs/include/alibabacloud/ecs/model/PurchaseStorageCapacityUnitRequest.h index df7bafafc..a5780166d 100644 --- a/ecs/include/alibabacloud/ecs/model/PurchaseStorageCapacityUnitRequest.h +++ b/ecs/include/alibabacloud/ecs/model/PurchaseStorageCapacityUnitRequest.h @@ -30,6 +30,12 @@ namespace AlibabaCloud { class ALIBABACLOUD_ECS_EXPORT PurchaseStorageCapacityUnitRequest : public RpcServiceRequest { + public: + struct Tag + { + std::string key; + std::string value; + }; public: PurchaseStorageCapacityUnitRequest(); @@ -47,6 +53,8 @@ namespace AlibabaCloud void setCapacity(int capacity); std::string getRegionId()const; void setRegionId(const std::string& regionId); + std::vector getTag()const; + void setTag(const std::vector& tag); int getPeriod()const; void setPeriod(int period); int getAmount()const; @@ -71,6 +79,7 @@ namespace AlibabaCloud std::string startTime_; int capacity_; std::string regionId_; + std::vector tag_; int period_; int amount_; std::string fromApp_; diff --git a/ecs/src/model/CreateAutoSnapshotPolicyRequest.cc b/ecs/src/model/CreateAutoSnapshotPolicyRequest.cc index 371e2c402..facce10f4 100644 --- a/ecs/src/model/CreateAutoSnapshotPolicyRequest.cc +++ b/ecs/src/model/CreateAutoSnapshotPolicyRequest.cc @@ -71,6 +71,17 @@ void CreateAutoSnapshotPolicyRequest::setRepeatWeekdays(const std::string& repea setParameter("RepeatWeekdays", repeatWeekdays); } +std::string CreateAutoSnapshotPolicyRequest::getResourceGroupId()const +{ + return resourceGroupId_; +} + +void CreateAutoSnapshotPolicyRequest::setResourceGroupId(const std::string& resourceGroupId) +{ + resourceGroupId_ = resourceGroupId; + setParameter("ResourceGroupId", resourceGroupId); +} + std::string CreateAutoSnapshotPolicyRequest::getRegionId()const { return regionId_; diff --git a/ecs/src/model/DeleteSnapshotGroupResult.cc b/ecs/src/model/DeleteSnapshotGroupResult.cc index d509ab41b..ce0959b18 100644 --- a/ecs/src/model/DeleteSnapshotGroupResult.cc +++ b/ecs/src/model/DeleteSnapshotGroupResult.cc @@ -43,12 +43,12 @@ void DeleteSnapshotGroupResult::parse(const std::string &payload) for (auto valueOperationProgressSetOperationProgress : allOperationProgressSetNode) { OperationProgress operationProgressSetObject; - if(!valueOperationProgressSetOperationProgress["OperationStatus"].isNull()) - operationProgressSetObject.operationStatus = valueOperationProgressSetOperationProgress["OperationStatus"].asString(); - if(!valueOperationProgressSetOperationProgress["ErrorCode"].isNull()) - operationProgressSetObject.errorCode = valueOperationProgressSetOperationProgress["ErrorCode"].asString(); if(!valueOperationProgressSetOperationProgress["ErrorMsg"].isNull()) operationProgressSetObject.errorMsg = valueOperationProgressSetOperationProgress["ErrorMsg"].asString(); + if(!valueOperationProgressSetOperationProgress["ErrorCode"].isNull()) + operationProgressSetObject.errorCode = valueOperationProgressSetOperationProgress["ErrorCode"].asString(); + if(!valueOperationProgressSetOperationProgress["OperationStatus"].isNull()) + operationProgressSetObject.operationStatus = valueOperationProgressSetOperationProgress["OperationStatus"].asString(); auto allRelatedItemSetNode = valueOperationProgressSetOperationProgress["RelatedItemSet"]["RelatedItem"]; for (auto valueOperationProgressSetOperationProgressRelatedItemSetRelatedItem : allRelatedItemSetNode) { diff --git a/ecs/src/model/DescribeCloudAssistantStatusResult.cc b/ecs/src/model/DescribeCloudAssistantStatusResult.cc index 1b472381e..efce60a72 100644 --- a/ecs/src/model/DescribeCloudAssistantStatusResult.cc +++ b/ecs/src/model/DescribeCloudAssistantStatusResult.cc @@ -43,30 +43,32 @@ void DescribeCloudAssistantStatusResult::parse(const std::string &payload) for (auto valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus : allInstanceCloudAssistantStatusSetNode) { InstanceCloudAssistantStatus instanceCloudAssistantStatusSetObject; - if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].isNull()) - instanceCloudAssistantStatusSetObject.instanceId = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].asString(); - if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].isNull()) - instanceCloudAssistantStatusSetObject.oSType = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].asString(); if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantStatus"].isNull()) instanceCloudAssistantStatusSetObject.cloudAssistantStatus = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantStatus"].asString(); - if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantVersion"].isNull()) - instanceCloudAssistantStatusSetObject.cloudAssistantVersion = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantVersion"].asString(); - if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].isNull()) - instanceCloudAssistantStatusSetObject.invocationCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].asString()); - if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["ActiveTaskCount"].isNull()) - instanceCloudAssistantStatusSetObject.activeTaskCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["ActiveTaskCount"].asString()); if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastInvokedTime"].isNull()) instanceCloudAssistantStatusSetObject.lastInvokedTime = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastInvokedTime"].asString(); + if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantVersion"].isNull()) + instanceCloudAssistantStatusSetObject.cloudAssistantVersion = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["CloudAssistantVersion"].asString(); + if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["ActiveTaskCount"].isNull()) + instanceCloudAssistantStatusSetObject.activeTaskCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["ActiveTaskCount"].asString()); + if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].isNull()) + instanceCloudAssistantStatusSetObject.invocationCount = std::stol(valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InvocationCount"].asString()); + if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].isNull()) + instanceCloudAssistantStatusSetObject.instanceId = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["InstanceId"].asString(); if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastHeartbeatTime"].isNull()) instanceCloudAssistantStatusSetObject.lastHeartbeatTime = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["LastHeartbeatTime"].asString(); + if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].isNull()) + instanceCloudAssistantStatusSetObject.oSType = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["OSType"].asString(); + if(!valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["SupportSessionManager"].isNull()) + instanceCloudAssistantStatusSetObject.supportSessionManager = valueInstanceCloudAssistantStatusSetInstanceCloudAssistantStatus["SupportSessionManager"].asString() == "true"; instanceCloudAssistantStatusSet_.push_back(instanceCloudAssistantStatusSetObject); } - if(!value["TotalCount"].isNull()) - totalCount_ = std::stol(value["TotalCount"].asString()); - if(!value["PageNumber"].isNull()) - pageNumber_ = std::stol(value["PageNumber"].asString()); if(!value["PageSize"].isNull()) pageSize_ = std::stol(value["PageSize"].asString()); + if(!value["PageNumber"].isNull()) + pageNumber_ = std::stol(value["PageNumber"].asString()); + if(!value["TotalCount"].isNull()) + totalCount_ = std::stol(value["TotalCount"].asString()); } diff --git a/ecs/src/model/DescribeInstanceTypesRequest.cc b/ecs/src/model/DescribeInstanceTypesRequest.cc index 5eabdb3f8..56532485b 100644 --- a/ecs/src/model/DescribeInstanceTypesRequest.cc +++ b/ecs/src/model/DescribeInstanceTypesRequest.cc @@ -51,6 +51,17 @@ void DescribeInstanceTypesRequest::setInstanceTypes(const std::vector DescribeInstanceTypesResult::getInstanceTypes()const { return instanceTypes_; diff --git a/ecs/src/model/DescribeStorageCapacityUnitsRequest.cc b/ecs/src/model/DescribeStorageCapacityUnitsRequest.cc index 8e01a8176..0caa121ae 100644 --- a/ecs/src/model/DescribeStorageCapacityUnitsRequest.cc +++ b/ecs/src/model/DescribeStorageCapacityUnitsRequest.cc @@ -95,6 +95,22 @@ void DescribeStorageCapacityUnitsRequest::setPageSize(int pageSize) setParameter("PageSize", std::to_string(pageSize)); } +std::vector DescribeStorageCapacityUnitsRequest::getTag()const +{ + return tag_; +} + +void DescribeStorageCapacityUnitsRequest::setTag(const std::vector& tag) +{ + tag_ = tag; + for(int dep1 = 0; dep1!= tag.size(); dep1++) { + auto tagObj = tag.at(dep1); + std::string tagObjStr = "Tag." + std::to_string(dep1 + 1); + setParameter(tagObjStr + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + std::string DescribeStorageCapacityUnitsRequest::getResourceOwnerAccount()const { return resourceOwnerAccount_; @@ -139,6 +155,17 @@ void DescribeStorageCapacityUnitsRequest::setName(const std::string& name) setParameter("Name", name); } +std::string DescribeStorageCapacityUnitsRequest::getAllocationType()const +{ + return allocationType_; +} + +void DescribeStorageCapacityUnitsRequest::setAllocationType(const std::string& allocationType) +{ + allocationType_ = allocationType; + setParameter("AllocationType", allocationType); +} + std::vector DescribeStorageCapacityUnitsRequest::getStatus()const { return status_; @@ -152,14 +179,3 @@ void DescribeStorageCapacityUnitsRequest::setStatus(const std::vector PurchaseStorageCapacityUnitRequest::getTag()const +{ + return tag_; +} + +void PurchaseStorageCapacityUnitRequest::setTag(const std::vector& tag) +{ + tag_ = tag; + for(int dep1 = 0; dep1!= tag.size(); dep1++) { + auto tagObj = tag.at(dep1); + std::string tagObjStr = "Tag." + std::to_string(dep1 + 1); + setParameter(tagObjStr + ".Key", tagObj.key); + setParameter(tagObjStr + ".Value", tagObj.value); + } +} + int PurchaseStorageCapacityUnitRequest::getPeriod()const { return period_;