diff --git a/VERSION b/VERSION index 05f2d697f..c3e4998fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1222 \ No newline at end of file +1.36.1223 \ No newline at end of file diff --git a/hitsdb/include/alibabacloud/hitsdb/model/CreateLindormInstanceRequest.h b/hitsdb/include/alibabacloud/hitsdb/model/CreateLindormInstanceRequest.h index d71cfb88f..fd23ca897 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/CreateLindormInstanceRequest.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/CreateLindormInstanceRequest.h @@ -42,6 +42,8 @@ public: void setAccessKeyId(const std::string &accessKeyId); std::string getDuration() const; void setDuration(const std::string &duration); + std::string getResourceGroupId() const; + void setResourceGroupId(const std::string &resourceGroupId); std::string getSecurityToken() const; void setSecurityToken(const std::string &securityToken); std::string getRegionId() const; @@ -92,6 +94,7 @@ private: std::string filestoreSpec_; std::string accessKeyId_; std::string duration_; + std::string resourceGroupId_; std::string securityToken_; std::string regionId_; int tsdbNum_; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListRequest.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListRequest.h index 551e38fae..6beb6dcd1 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListRequest.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListRequest.h @@ -42,6 +42,8 @@ public: void setPageNumber(int pageNumber); std::string getAccessKeyId() const; void setAccessKeyId(const std::string &accessKeyId); + std::string getResourceGroupId() const; + void setResourceGroupId(const std::string &resourceGroupId); std::string getSecurityToken() const; void setSecurityToken(const std::string &securityToken); std::string getRegionId() const; @@ -66,6 +68,7 @@ private: int supportEngine_; int pageNumber_; std::string accessKeyId_; + std::string resourceGroupId_; std::string securityToken_; std::string regionId_; int pageSize_; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListResult.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListResult.h index 081665147..fcb26ec34 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListResult.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceListResult.h @@ -42,10 +42,12 @@ namespace AlibabaCloud long expiredMilliseconds; std::string instanceStorage; std::string zoneId; + std::string resourceGroupId; std::string instanceId; std::string createTime; std::string payType; std::string vpcId; + bool enableCompute; std::string networkType; std::string serviceType; std::string instanceAlias; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceRequest.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceRequest.h index f745652c9..727b45f4d 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceRequest.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceRequest.h @@ -36,8 +36,6 @@ public: void setAccessKeyId(const std::string &accessKeyId); std::string getSecurityToken() const; void setSecurityToken(const std::string &securityToken); - std::string getRegionId() const; - void setRegionId(const std::string ®ionId); std::string getResourceOwnerAccount() const; void setResourceOwnerAccount(const std::string &resourceOwnerAccount); std::string getOwnerAccount() const; @@ -51,7 +49,6 @@ private: long resourceOwnerId_; std::string accessKeyId_; std::string securityToken_; - std::string regionId_; std::string resourceOwnerAccount_; std::string ownerAccount_; long ownerId_; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h index ce7f92d07..6a992d6d5 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/GetLindormInstanceResult.h @@ -50,11 +50,13 @@ namespace AlibabaCloud long getExpiredMilliseconds()const; std::vector getEngineList()const; std::string getDiskThreshold()const; + std::string getResourceGroupId()const; bool getEnableBDS()const; bool getAutoRenew()const; std::string getDiskUsage()const; bool getEnableFS()const; bool getEnableShs()const; + std::string getMaintainEndTime()const; bool getEnableCompute()const; std::string getNetworkType()const; std::string getServiceType()const; @@ -62,6 +64,7 @@ namespace AlibabaCloud std::string getInstanceStatus()const; int getEngineType()const; long getCreateMilliseconds()const; + std::string getMaintainStartTime()const; bool getEnableSSL()const; std::string getInstanceStorage()const; std::string getZoneId()const; @@ -87,11 +90,13 @@ namespace AlibabaCloud long expiredMilliseconds_; std::vector engineList_; std::string diskThreshold_; + std::string resourceGroupId_; bool enableBDS_; bool autoRenew_; std::string diskUsage_; bool enableFS_; bool enableShs_; + std::string maintainEndTime_; bool enableCompute_; std::string networkType_; std::string serviceType_; @@ -99,6 +104,7 @@ namespace AlibabaCloud std::string instanceStatus_; int engineType_; long createMilliseconds_; + std::string maintainStartTime_; bool enableSSL_; std::string instanceStorage_; std::string zoneId_; diff --git a/hitsdb/include/alibabacloud/hitsdb/model/TagResourcesRequest.h b/hitsdb/include/alibabacloud/hitsdb/model/TagResourcesRequest.h index ca94ea095..cfc70f196 100644 --- a/hitsdb/include/alibabacloud/hitsdb/model/TagResourcesRequest.h +++ b/hitsdb/include/alibabacloud/hitsdb/model/TagResourcesRequest.h @@ -40,6 +40,8 @@ public: void setAccessKeyId(const std::string &accessKeyId); std::string getSecurityToken() const; void setSecurityToken(const std::string &securityToken); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); std::vector getTag() const; void setTag(const std::vector &tag); std::vector getResourceId() const; @@ -57,6 +59,7 @@ private: long resourceOwnerId_; std::string accessKeyId_; std::string securityToken_; + std::string regionId_; std::vector tag_; std::vector resourceId_; std::string resourceOwnerAccount_; diff --git a/hitsdb/src/model/CreateLindormInstanceRequest.cc b/hitsdb/src/model/CreateLindormInstanceRequest.cc index 2d399e049..a599b119e 100644 --- a/hitsdb/src/model/CreateLindormInstanceRequest.cc +++ b/hitsdb/src/model/CreateLindormInstanceRequest.cc @@ -79,6 +79,15 @@ void CreateLindormInstanceRequest::setDuration(const std::string &duration) { setParameter(std::string("Duration"), duration); } +std::string CreateLindormInstanceRequest::getResourceGroupId() const { + return resourceGroupId_; +} + +void CreateLindormInstanceRequest::setResourceGroupId(const std::string &resourceGroupId) { + resourceGroupId_ = resourceGroupId; + setParameter(std::string("ResourceGroupId"), resourceGroupId); +} + std::string CreateLindormInstanceRequest::getSecurityToken() const { return securityToken_; } diff --git a/hitsdb/src/model/GetLindormInstanceListRequest.cc b/hitsdb/src/model/GetLindormInstanceListRequest.cc index 4d4eaf2e9..223339516 100644 --- a/hitsdb/src/model/GetLindormInstanceListRequest.cc +++ b/hitsdb/src/model/GetLindormInstanceListRequest.cc @@ -61,6 +61,15 @@ void GetLindormInstanceListRequest::setAccessKeyId(const std::string &accessKeyI setParameter(std::string("AccessKeyId"), accessKeyId); } +std::string GetLindormInstanceListRequest::getResourceGroupId() const { + return resourceGroupId_; +} + +void GetLindormInstanceListRequest::setResourceGroupId(const std::string &resourceGroupId) { + resourceGroupId_ = resourceGroupId; + setParameter(std::string("ResourceGroupId"), resourceGroupId); +} + std::string GetLindormInstanceListRequest::getSecurityToken() const { return securityToken_; } diff --git a/hitsdb/src/model/GetLindormInstanceListResult.cc b/hitsdb/src/model/GetLindormInstanceListResult.cc index 265aae5e8..b544469c1 100644 --- a/hitsdb/src/model/GetLindormInstanceListResult.cc +++ b/hitsdb/src/model/GetLindormInstanceListResult.cc @@ -77,6 +77,10 @@ void GetLindormInstanceListResult::parse(const std::string &payload) instanceListObject.expiredMilliseconds = std::stol(valueInstanceListLindormInstanceSummary["ExpiredMilliseconds"].asString()); if(!valueInstanceListLindormInstanceSummary["EnableStream"].isNull()) instanceListObject.enableStream = valueInstanceListLindormInstanceSummary["EnableStream"].asString() == "true"; + if(!valueInstanceListLindormInstanceSummary["EnableCompute"].isNull()) + instanceListObject.enableCompute = valueInstanceListLindormInstanceSummary["EnableCompute"].asString() == "true"; + if(!valueInstanceListLindormInstanceSummary["ResourceGroupId"].isNull()) + instanceListObject.resourceGroupId = valueInstanceListLindormInstanceSummary["ResourceGroupId"].asString(); auto allTagsNode = valueInstanceListLindormInstanceSummary["Tags"]["Tag"]; for (auto valueInstanceListLindormInstanceSummaryTagsTag : allTagsNode) { diff --git a/hitsdb/src/model/GetLindormInstanceRequest.cc b/hitsdb/src/model/GetLindormInstanceRequest.cc index 152f4d341..2ab667b0b 100644 --- a/hitsdb/src/model/GetLindormInstanceRequest.cc +++ b/hitsdb/src/model/GetLindormInstanceRequest.cc @@ -52,15 +52,6 @@ void GetLindormInstanceRequest::setSecurityToken(const std::string &securityToke setParameter(std::string("SecurityToken"), securityToken); } -std::string GetLindormInstanceRequest::getRegionId() const { - return regionId_; -} - -void GetLindormInstanceRequest::setRegionId(const std::string ®ionId) { - regionId_ = regionId; - setParameter(std::string("RegionId"), regionId); -} - std::string GetLindormInstanceRequest::getResourceOwnerAccount() const { return resourceOwnerAccount_; } diff --git a/hitsdb/src/model/GetLindormInstanceResult.cc b/hitsdb/src/model/GetLindormInstanceResult.cc index 90801cba1..10ed21fcc 100644 --- a/hitsdb/src/model/GetLindormInstanceResult.cc +++ b/hitsdb/src/model/GetLindormInstanceResult.cc @@ -123,6 +123,12 @@ void GetLindormInstanceResult::parse(const std::string &payload) enableStream_ = value["EnableStream"].asString() == "true"; if(!value["EnableShs"].isNull()) enableShs_ = value["EnableShs"].asString() == "true"; + if(!value["MaintainStartTime"].isNull()) + maintainStartTime_ = value["MaintainStartTime"].asString(); + if(!value["MaintainEndTime"].isNull()) + maintainEndTime_ = value["MaintainEndTime"].asString(); + if(!value["ResourceGroupId"].isNull()) + resourceGroupId_ = value["ResourceGroupId"].asString(); } @@ -141,6 +147,11 @@ std::string GetLindormInstanceResult::getDiskThreshold()const return diskThreshold_; } +std::string GetLindormInstanceResult::getResourceGroupId()const +{ + return resourceGroupId_; +} + bool GetLindormInstanceResult::getEnableBDS()const { return enableBDS_; @@ -166,6 +177,11 @@ bool GetLindormInstanceResult::getEnableShs()const return enableShs_; } +std::string GetLindormInstanceResult::getMaintainEndTime()const +{ + return maintainEndTime_; +} + bool GetLindormInstanceResult::getEnableCompute()const { return enableCompute_; @@ -201,6 +217,11 @@ long GetLindormInstanceResult::getCreateMilliseconds()const return createMilliseconds_; } +std::string GetLindormInstanceResult::getMaintainStartTime()const +{ + return maintainStartTime_; +} + bool GetLindormInstanceResult::getEnableSSL()const { return enableSSL_; diff --git a/hitsdb/src/model/TagResourcesRequest.cc b/hitsdb/src/model/TagResourcesRequest.cc index b0d9efbf5..1a9b96937 100644 --- a/hitsdb/src/model/TagResourcesRequest.cc +++ b/hitsdb/src/model/TagResourcesRequest.cc @@ -52,6 +52,15 @@ void TagResourcesRequest::setSecurityToken(const std::string &securityToken) { setParameter(std::string("SecurityToken"), securityToken); } +std::string TagResourcesRequest::getRegionId() const { + return regionId_; +} + +void TagResourcesRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + std::vector TagResourcesRequest::getTag() const { return tag_; }