From 213faf8f4f615cf22bae2dd1f9d5c8c0965756d1 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Mon, 21 Feb 2022 13:11:10 +0000 Subject: [PATCH] Add event tasks. --- CHANGELOG | 4 + VERSION | 2 +- .../hbase/model/DescribeInstanceResult.h | 100 ++--- hbase/src/model/DescribeInstanceResult.cc | 404 +++++++++--------- 4 files changed, 266 insertions(+), 244 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9fc79edd1..7cfa67244 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +2022-02-21 Version: 1.36.1062 +- Add event tasks. +- DescribeInstance taskProgress. + 2022-02-21 Version: 1.36.1061 - Bugfix QueryMoniter. diff --git a/VERSION b/VERSION index 9e0cf3dc5..0ed39a5de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1061 \ No newline at end of file +1.36.1062 \ No newline at end of file diff --git a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h index 5442adc0a..aa1d52896 100644 --- a/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h +++ b/hbase/include/alibabacloud/hbase/model/DescribeInstanceResult.h @@ -43,105 +43,109 @@ namespace AlibabaCloud explicit DescribeInstanceResult(const std::string &payload); ~DescribeInstanceResult(); std::string getModuleStackVersion()const; - bool getIsHa()const; std::string getCreatedTime()const; std::string getResourceGroupId()const; bool getNeedUpgrade()const; + int getModuleId()const; + std::vector getTags()const; + std::vector getNeedUpgradeComps()const; + std::string getEngine()const; + std::string getStatus()const; + int getColdStorageSize()const; + std::string getEncryptionType()const; + std::string getExpireTimeUTC()const; + int getMasterDiskSize()const; + std::string getInstanceId()const; + int getDuration()const; + std::string getPayType()const; + std::string getVswitchId()const; + int getMasterNodeCount()const; + std::string getInstanceName()const; + std::string getVpcId()const; + bool getAutoRenewal()const; + std::string getCoreDiskType()const; + std::string getExpireTime()const; + std::string getBackupStatus()const; + bool getIsHa()const; std::string getEncryptionKey()const; + std::string getTaskProgress()const; std::string getMasterInstanceType()const; bool getIsDeletionProtection()const; bool getIsLatestVersion()const; - int getModuleId()const; std::string getMaintainEndTime()const; std::string getNetworkType()const; std::string getCoreInstanceType()const; std::string getClusterName()const; std::string getMasterDiskType()const; - std::vector getTags()const; - std::vector getNeedUpgradeComps()const; - std::string getEngine()const; std::string getMaintainStartTime()const; - std::string getStatus()const; + std::string getParentId()const; std::string getMajorVersion()const; std::string getCoreDiskCount()const; - std::string getParentId()const; - int getColdStorageSize()const; - std::string getEncryptionType()const; - int getMasterDiskSize()const; - std::string getExpireTimeUTC()const; std::string getZoneId()const; - std::string getInstanceId()const; - int getCoreNodeCount()const; std::string getClusterId()const; + int getCoreNodeCount()const; std::string getColdStorageStatus()const; - std::string getMinorVersion()const; std::string getCreatedTimeUTC()const; - int getDuration()const; - std::string getPayType()const; + std::string getMinorVersion()const; bool getIsMultiModel()const; std::string getClusterType()const; - std::string getVswitchId()const; - std::string getInstanceName()const; - int getMasterNodeCount()const; - std::string getVpcId()const; - bool getAutoRenewal()const; - std::string getCoreDiskType()const; std::string getRegionId()const; - std::string getExpireTime()const; + std::string getConfirmMaintainTime()const; int getCoreDiskSize()const; - std::string getBackupStatus()const; protected: void parse(const std::string &payload); private: std::string moduleStackVersion_; - bool isHa_; std::string createdTime_; std::string resourceGroupId_; bool needUpgrade_; + int moduleId_; + std::vector tags_; + std::vector needUpgradeComps_; + std::string engine_; + std::string status_; + int coldStorageSize_; + std::string encryptionType_; + std::string expireTimeUTC_; + int masterDiskSize_; + std::string instanceId_; + int duration_; + std::string payType_; + std::string vswitchId_; + int masterNodeCount_; + std::string instanceName_; + std::string vpcId_; + bool autoRenewal_; + std::string coreDiskType_; + std::string expireTime_; + std::string backupStatus_; + bool isHa_; std::string encryptionKey_; + std::string taskProgress_; std::string masterInstanceType_; bool isDeletionProtection_; bool isLatestVersion_; - int moduleId_; std::string maintainEndTime_; std::string networkType_; std::string coreInstanceType_; std::string clusterName_; std::string masterDiskType_; - std::vector tags_; - std::vector needUpgradeComps_; - std::string engine_; std::string maintainStartTime_; - std::string status_; + std::string parentId_; std::string majorVersion_; std::string coreDiskCount_; - std::string parentId_; - int coldStorageSize_; - std::string encryptionType_; - int masterDiskSize_; - std::string expireTimeUTC_; std::string zoneId_; - std::string instanceId_; - int coreNodeCount_; std::string clusterId_; + int coreNodeCount_; std::string coldStorageStatus_; - std::string minorVersion_; std::string createdTimeUTC_; - int duration_; - std::string payType_; + std::string minorVersion_; bool isMultiModel_; std::string clusterType_; - std::string vswitchId_; - std::string instanceName_; - int masterNodeCount_; - std::string vpcId_; - bool autoRenewal_; - std::string coreDiskType_; std::string regionId_; - std::string expireTime_; + std::string confirmMaintainTime_; int coreDiskSize_; - std::string backupStatus_; }; } diff --git a/hbase/src/model/DescribeInstanceResult.cc b/hbase/src/model/DescribeInstanceResult.cc index 009e81f75..f3325352e 100644 --- a/hbase/src/model/DescribeInstanceResult.cc +++ b/hbase/src/model/DescribeInstanceResult.cc @@ -52,98 +52,102 @@ void DescribeInstanceResult::parse(const std::string &payload) auto allNeedUpgradeComps = value["NeedUpgradeComps"]["Comps"]; for (const auto &item : allNeedUpgradeComps) needUpgradeComps_.push_back(item.asString()); - if(!value["InstanceId"].isNull()) - instanceId_ = value["InstanceId"].asString(); - if(!value["InstanceName"].isNull()) - instanceName_ = value["InstanceName"].asString(); - if(!value["Status"].isNull()) - status_ = value["Status"].asString(); - if(!value["PayType"].isNull()) - payType_ = value["PayType"].asString(); - if(!value["CreatedTime"].isNull()) - createdTime_ = value["CreatedTime"].asString(); - if(!value["ExpireTime"].isNull()) - expireTime_ = value["ExpireTime"].asString(); - if(!value["MajorVersion"].isNull()) - majorVersion_ = value["MajorVersion"].asString(); - if(!value["MinorVersion"].isNull()) - minorVersion_ = value["MinorVersion"].asString(); - if(!value["Engine"].isNull()) - engine_ = value["Engine"].asString(); - if(!value["IsHa"].isNull()) - isHa_ = value["IsHa"].asString() == "true"; - if(!value["NetworkType"].isNull()) - networkType_ = value["NetworkType"].asString(); if(!value["VpcId"].isNull()) vpcId_ = value["VpcId"].asString(); - if(!value["VswitchId"].isNull()) - vswitchId_ = value["VswitchId"].asString(); - if(!value["MasterInstanceType"].isNull()) - masterInstanceType_ = value["MasterInstanceType"].asString(); - if(!value["MasterNodeCount"].isNull()) - masterNodeCount_ = std::stoi(value["MasterNodeCount"].asString()); - if(!value["MasterDiskType"].isNull()) - masterDiskType_ = value["MasterDiskType"].asString(); - if(!value["MasterDiskSize"].isNull()) - masterDiskSize_ = std::stoi(value["MasterDiskSize"].asString()); - if(!value["CoreInstanceType"].isNull()) - coreInstanceType_ = value["CoreInstanceType"].asString(); - if(!value["CoreNodeCount"].isNull()) - coreNodeCount_ = std::stoi(value["CoreNodeCount"].asString()); - if(!value["CoreDiskType"].isNull()) - coreDiskType_ = value["CoreDiskType"].asString(); - if(!value["CoreDiskSize"].isNull()) - coreDiskSize_ = std::stoi(value["CoreDiskSize"].asString()); - if(!value["RegionId"].isNull()) - regionId_ = value["RegionId"].asString(); - if(!value["ZoneId"].isNull()) - zoneId_ = value["ZoneId"].asString(); - if(!value["ColdStorageStatus"].isNull()) - coldStorageStatus_ = value["ColdStorageStatus"].asString(); - if(!value["BackupStatus"].isNull()) - backupStatus_ = value["BackupStatus"].asString(); - if(!value["CoreDiskCount"].isNull()) - coreDiskCount_ = value["CoreDiskCount"].asString(); - if(!value["MaintainStartTime"].isNull()) - maintainStartTime_ = value["MaintainStartTime"].asString(); - if(!value["MaintainEndTime"].isNull()) - maintainEndTime_ = value["MaintainEndTime"].asString(); - if(!value["CreatedTimeUTC"].isNull()) - createdTimeUTC_ = value["CreatedTimeUTC"].asString(); - if(!value["ExpireTimeUTC"].isNull()) - expireTimeUTC_ = value["ExpireTimeUTC"].asString(); - if(!value["IsLatestVersion"].isNull()) - isLatestVersion_ = value["IsLatestVersion"].asString() == "true"; - if(!value["IsMultiModel"].isNull()) - isMultiModel_ = value["IsMultiModel"].asString() == "true"; - if(!value["ClusterType"].isNull()) - clusterType_ = value["ClusterType"].asString(); - if(!value["ClusterId"].isNull()) - clusterId_ = value["ClusterId"].asString(); - if(!value["ClusterName"].isNull()) - clusterName_ = value["ClusterName"].asString(); - if(!value["IsDeletionProtection"].isNull()) - isDeletionProtection_ = value["IsDeletionProtection"].asString() == "true"; - if(!value["ParentId"].isNull()) - parentId_ = value["ParentId"].asString(); - if(!value["ModuleId"].isNull()) - moduleId_ = std::stoi(value["ModuleId"].asString()); - if(!value["ModuleStackVersion"].isNull()) - moduleStackVersion_ = value["ModuleStackVersion"].asString(); - if(!value["AutoRenewal"].isNull()) - autoRenewal_ = value["AutoRenewal"].asString() == "true"; - if(!value["Duration"].isNull()) - duration_ = std::stoi(value["Duration"].asString()); - if(!value["ColdStorageSize"].isNull()) - coldStorageSize_ = std::stoi(value["ColdStorageSize"].asString()); - if(!value["ResourceGroupId"].isNull()) - resourceGroupId_ = value["ResourceGroupId"].asString(); + if(!value["Status"].isNull()) + status_ = value["Status"].asString(); if(!value["EncryptionType"].isNull()) encryptionType_ = value["EncryptionType"].asString(); + if(!value["ModuleId"].isNull()) + moduleId_ = std::stoi(value["ModuleId"].asString()); + if(!value["VswitchId"].isNull()) + vswitchId_ = value["VswitchId"].asString(); + if(!value["BackupStatus"].isNull()) + backupStatus_ = value["BackupStatus"].asString(); + if(!value["PayType"].isNull()) + payType_ = value["PayType"].asString(); + if(!value["CoreDiskType"].isNull()) + coreDiskType_ = value["CoreDiskType"].asString(); + if(!value["MasterNodeCount"].isNull()) + masterNodeCount_ = std::stoi(value["MasterNodeCount"].asString()); + if(!value["NetworkType"].isNull()) + networkType_ = value["NetworkType"].asString(); + if(!value["CreatedTimeUTC"].isNull()) + createdTimeUTC_ = value["CreatedTimeUTC"].asString(); + if(!value["ColdStorageSize"].isNull()) + coldStorageSize_ = std::stoi(value["ColdStorageSize"].asString()); + if(!value["ParentId"].isNull()) + parentId_ = value["ParentId"].asString(); + if(!value["IsLatestVersion"].isNull()) + isLatestVersion_ = value["IsLatestVersion"].asString() == "true"; + if(!value["ExpireTimeUTC"].isNull()) + expireTimeUTC_ = value["ExpireTimeUTC"].asString(); + if(!value["InstanceName"].isNull()) + instanceName_ = value["InstanceName"].asString(); + if(!value["MasterInstanceType"].isNull()) + masterInstanceType_ = value["MasterInstanceType"].asString(); + if(!value["CoreInstanceType"].isNull()) + coreInstanceType_ = value["CoreInstanceType"].asString(); if(!value["EncryptionKey"].isNull()) encryptionKey_ = value["EncryptionKey"].asString(); + if(!value["CreatedTime"].isNull()) + createdTime_ = value["CreatedTime"].asString(); + if(!value["CoreDiskSize"].isNull()) + coreDiskSize_ = std::stoi(value["CoreDiskSize"].asString()); + if(!value["ClusterId"].isNull()) + clusterId_ = value["ClusterId"].asString(); + if(!value["ExpireTime"].isNull()) + expireTime_ = value["ExpireTime"].asString(); + if(!value["MaintainStartTime"].isNull()) + maintainStartTime_ = value["MaintainStartTime"].asString(); + if(!value["ConfirmMaintainTime"].isNull()) + confirmMaintainTime_ = value["ConfirmMaintainTime"].asString(); + if(!value["IsHa"].isNull()) + isHa_ = value["IsHa"].asString() == "true"; + if(!value["MaintainEndTime"].isNull()) + maintainEndTime_ = value["MaintainEndTime"].asString(); + if(!value["InstanceId"].isNull()) + instanceId_ = value["InstanceId"].asString(); + if(!value["ColdStorageStatus"].isNull()) + coldStorageStatus_ = value["ColdStorageStatus"].asString(); + if(!value["IsDeletionProtection"].isNull()) + isDeletionProtection_ = value["IsDeletionProtection"].asString() == "true"; + if(!value["MinorVersion"].isNull()) + minorVersion_ = value["MinorVersion"].asString(); + if(!value["RegionId"].isNull()) + regionId_ = value["RegionId"].asString(); + if(!value["MasterDiskSize"].isNull()) + masterDiskSize_ = std::stoi(value["MasterDiskSize"].asString()); + if(!value["MasterDiskType"].isNull()) + masterDiskType_ = value["MasterDiskType"].asString(); if(!value["NeedUpgrade"].isNull()) needUpgrade_ = value["NeedUpgrade"].asString() == "true"; + if(!value["IsMultiModel"].isNull()) + isMultiModel_ = value["IsMultiModel"].asString() == "true"; + if(!value["AutoRenewal"].isNull()) + autoRenewal_ = value["AutoRenewal"].asString() == "true"; + if(!value["ClusterType"].isNull()) + clusterType_ = value["ClusterType"].asString(); + if(!value["ResourceGroupId"].isNull()) + resourceGroupId_ = value["ResourceGroupId"].asString(); + if(!value["ClusterName"].isNull()) + clusterName_ = value["ClusterName"].asString(); + if(!value["ZoneId"].isNull()) + zoneId_ = value["ZoneId"].asString(); + if(!value["Duration"].isNull()) + duration_ = std::stoi(value["Duration"].asString()); + if(!value["ModuleStackVersion"].isNull()) + moduleStackVersion_ = value["ModuleStackVersion"].asString(); + if(!value["Engine"].isNull()) + engine_ = value["Engine"].asString(); + if(!value["MajorVersion"].isNull()) + majorVersion_ = value["MajorVersion"].asString(); + if(!value["CoreDiskCount"].isNull()) + coreDiskCount_ = value["CoreDiskCount"].asString(); + if(!value["TaskProgress"].isNull()) + taskProgress_ = value["TaskProgress"].asString(); + if(!value["CoreNodeCount"].isNull()) + coreNodeCount_ = std::stoi(value["CoreNodeCount"].asString()); } @@ -152,11 +156,6 @@ std::string DescribeInstanceResult::getModuleStackVersion()const return moduleStackVersion_; } -bool DescribeInstanceResult::getIsHa()const -{ - return isHa_; -} - std::string DescribeInstanceResult::getCreatedTime()const { return createdTime_; @@ -172,11 +171,121 @@ bool DescribeInstanceResult::getNeedUpgrade()const return needUpgrade_; } +int DescribeInstanceResult::getModuleId()const +{ + return moduleId_; +} + +std::vector DescribeInstanceResult::getTags()const +{ + return tags_; +} + +std::vector DescribeInstanceResult::getNeedUpgradeComps()const +{ + return needUpgradeComps_; +} + +std::string DescribeInstanceResult::getEngine()const +{ + return engine_; +} + +std::string DescribeInstanceResult::getStatus()const +{ + return status_; +} + +int DescribeInstanceResult::getColdStorageSize()const +{ + return coldStorageSize_; +} + +std::string DescribeInstanceResult::getEncryptionType()const +{ + return encryptionType_; +} + +std::string DescribeInstanceResult::getExpireTimeUTC()const +{ + return expireTimeUTC_; +} + +int DescribeInstanceResult::getMasterDiskSize()const +{ + return masterDiskSize_; +} + +std::string DescribeInstanceResult::getInstanceId()const +{ + return instanceId_; +} + +int DescribeInstanceResult::getDuration()const +{ + return duration_; +} + +std::string DescribeInstanceResult::getPayType()const +{ + return payType_; +} + +std::string DescribeInstanceResult::getVswitchId()const +{ + return vswitchId_; +} + +int DescribeInstanceResult::getMasterNodeCount()const +{ + return masterNodeCount_; +} + +std::string DescribeInstanceResult::getInstanceName()const +{ + return instanceName_; +} + +std::string DescribeInstanceResult::getVpcId()const +{ + return vpcId_; +} + +bool DescribeInstanceResult::getAutoRenewal()const +{ + return autoRenewal_; +} + +std::string DescribeInstanceResult::getCoreDiskType()const +{ + return coreDiskType_; +} + +std::string DescribeInstanceResult::getExpireTime()const +{ + return expireTime_; +} + +std::string DescribeInstanceResult::getBackupStatus()const +{ + return backupStatus_; +} + +bool DescribeInstanceResult::getIsHa()const +{ + return isHa_; +} + std::string DescribeInstanceResult::getEncryptionKey()const { return encryptionKey_; } +std::string DescribeInstanceResult::getTaskProgress()const +{ + return taskProgress_; +} + std::string DescribeInstanceResult::getMasterInstanceType()const { return masterInstanceType_; @@ -192,11 +301,6 @@ bool DescribeInstanceResult::getIsLatestVersion()const return isLatestVersion_; } -int DescribeInstanceResult::getModuleId()const -{ - return moduleId_; -} - std::string DescribeInstanceResult::getMaintainEndTime()const { return maintainEndTime_; @@ -222,29 +326,14 @@ std::string DescribeInstanceResult::getMasterDiskType()const return masterDiskType_; } -std::vector DescribeInstanceResult::getTags()const -{ - return tags_; -} - -std::vector DescribeInstanceResult::getNeedUpgradeComps()const -{ - return needUpgradeComps_; -} - -std::string DescribeInstanceResult::getEngine()const -{ - return engine_; -} - std::string DescribeInstanceResult::getMaintainStartTime()const { return maintainStartTime_; } -std::string DescribeInstanceResult::getStatus()const +std::string DescribeInstanceResult::getParentId()const { - return status_; + return parentId_; } std::string DescribeInstanceResult::getMajorVersion()const @@ -257,74 +346,34 @@ std::string DescribeInstanceResult::getCoreDiskCount()const return coreDiskCount_; } -std::string DescribeInstanceResult::getParentId()const -{ - return parentId_; -} - -int DescribeInstanceResult::getColdStorageSize()const -{ - return coldStorageSize_; -} - -std::string DescribeInstanceResult::getEncryptionType()const -{ - return encryptionType_; -} - -int DescribeInstanceResult::getMasterDiskSize()const -{ - return masterDiskSize_; -} - -std::string DescribeInstanceResult::getExpireTimeUTC()const -{ - return expireTimeUTC_; -} - std::string DescribeInstanceResult::getZoneId()const { return zoneId_; } -std::string DescribeInstanceResult::getInstanceId()const -{ - return instanceId_; -} - -int DescribeInstanceResult::getCoreNodeCount()const -{ - return coreNodeCount_; -} - std::string DescribeInstanceResult::getClusterId()const { return clusterId_; } +int DescribeInstanceResult::getCoreNodeCount()const +{ + return coreNodeCount_; +} + std::string DescribeInstanceResult::getColdStorageStatus()const { return coldStorageStatus_; } -std::string DescribeInstanceResult::getMinorVersion()const -{ - return minorVersion_; -} - std::string DescribeInstanceResult::getCreatedTimeUTC()const { return createdTimeUTC_; } -int DescribeInstanceResult::getDuration()const +std::string DescribeInstanceResult::getMinorVersion()const { - return duration_; -} - -std::string DescribeInstanceResult::getPayType()const -{ - return payType_; + return minorVersion_; } bool DescribeInstanceResult::getIsMultiModel()const @@ -337,44 +386,14 @@ std::string DescribeInstanceResult::getClusterType()const return clusterType_; } -std::string DescribeInstanceResult::getVswitchId()const -{ - return vswitchId_; -} - -std::string DescribeInstanceResult::getInstanceName()const -{ - return instanceName_; -} - -int DescribeInstanceResult::getMasterNodeCount()const -{ - return masterNodeCount_; -} - -std::string DescribeInstanceResult::getVpcId()const -{ - return vpcId_; -} - -bool DescribeInstanceResult::getAutoRenewal()const -{ - return autoRenewal_; -} - -std::string DescribeInstanceResult::getCoreDiskType()const -{ - return coreDiskType_; -} - std::string DescribeInstanceResult::getRegionId()const { return regionId_; } -std::string DescribeInstanceResult::getExpireTime()const +std::string DescribeInstanceResult::getConfirmMaintainTime()const { - return expireTime_; + return confirmMaintainTime_; } int DescribeInstanceResult::getCoreDiskSize()const @@ -382,8 +401,3 @@ int DescribeInstanceResult::getCoreDiskSize()const return coreDiskSize_; } -std::string DescribeInstanceResult::getBackupStatus()const -{ - return backupStatus_; -} -