From 0c68cf4369d4949d29649fb5c5558244d93881bf Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 7 Jan 2020 14:38:55 +0800 Subject: [PATCH] Generated 2014-05-26 for Ecs. --- CHANGELOG | 3 +++ VERSION | 2 +- .../ecs/model/DescribeCommandsResult.h | 1 + .../DescribeInstanceHistoryEventsResult.h | 9 +++++++++ .../model/DescribeInstancesFullStatusResult.h | 9 +++++++++ .../ecs/model/DescribeInvocationsResult.h | 14 ++++++++++--- .../model/ModifyPrepayInstanceSpecRequest.h | 3 +++ ecs/src/model/DescribeCommandsResult.cc | 2 ++ .../DescribeInstanceHistoryEventsResult.cc | 16 +++++++++++++++ .../DescribeInstancesFullStatusResult.cc | 16 +++++++++++++++ ecs/src/model/DescribeInvocationsResult.cc | 20 +++++++++++++++++-- .../model/ModifyPrepayInstanceSpecRequest.cc | 11 ++++++++++ 12 files changed, 100 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b15e28a9d..59c5bf3f3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-01-07 Version 1.36.233 +- Generated 2014-05-26 for `Ecs`. + 2020-01-03 Version 1.36.232 - Add GWS serie apis. - Add QueryReport. diff --git a/VERSION b/VERSION index 6b1515f9f..04c9450d1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.232 \ No newline at end of file +1.36.233 \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h index b3f30f773..8596e6563 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeCommandsResult.h @@ -40,6 +40,7 @@ namespace AlibabaCloud std::string description; std::vector parameterNames; long timeout; + int invokeTimes; std::string creationTime; bool enableParameter; std::string commandId; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h index 077bebd3a..edd375643 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h @@ -46,7 +46,16 @@ namespace AlibabaCloud }; struct ExtendedAttribute { + struct InactiveDisk + { + std::string deviceType; + std::string releaseTime; + std::string deviceSize; + std::string creationTime; + std::string deviceCategory; + }; std::string device; + std::vector inactiveDisks; std::string diskId; }; std::string eventFinishTime; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusResult.h index 8e554293f..bcabab8f1 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusResult.h @@ -58,7 +58,16 @@ namespace AlibabaCloud }; struct ExtendedAttribute { + struct InactiveDisk + { + std::string deviceType; + std::string releaseTime; + std::string deviceSize; + std::string creationTime; + std::string deviceCategory; + }; std::string device; + std::vector inactiveDisks; std::string diskId; }; EventCycleStatus eventCycleStatus; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h index b4d0e241a..b9a92529b 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInvocationsResult.h @@ -36,19 +36,27 @@ namespace AlibabaCloud { struct InvokeInstance { - std::string finishTime; + int dropped; + std::string invocationStatus; std::string instanceId; std::string instanceInvokeStatus; - std::string output; long exitCode; - std::string creationTime; + std::string errorInfo; std::string startTime; + int repeats; + std::string finishTime; + std::string output; + std::string creationTime; + std::string updateTime; + std::string errorCode; + std::string stopTime; }; std::string commandContent; std::string invokeStatus; std::string parameters; std::string commandType; bool timed; + std::string creationTime; std::string frequency; std::string commandId; std::string commandName; diff --git a/ecs/include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecRequest.h b/ecs/include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecRequest.h index 3805a0589..3218f40b3 100644 --- a/ecs/include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecRequest.h +++ b/ecs/include/alibabacloud/ecs/model/ModifyPrepayInstanceSpecRequest.h @@ -53,6 +53,8 @@ namespace AlibabaCloud void setInstanceType(const std::string& instanceType); bool getAutoPay()const; void setAutoPay(bool autoPay); + bool getRebootWhenFinished()const; + void setRebootWhenFinished(bool rebootWhenFinished); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -74,6 +76,7 @@ namespace AlibabaCloud bool migrateAcrossZone_; std::string instanceType_; bool autoPay_; + bool rebootWhenFinished_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string endTime_; diff --git a/ecs/src/model/DescribeCommandsResult.cc b/ecs/src/model/DescribeCommandsResult.cc index fe8d4afa8..b05fd642d 100644 --- a/ecs/src/model/DescribeCommandsResult.cc +++ b/ecs/src/model/DescribeCommandsResult.cc @@ -57,6 +57,8 @@ void DescribeCommandsResult::parse(const std::string &payload) commandsObject.workingDir = valueCommandsCommand["WorkingDir"].asString(); if(!valueCommandsCommand["Timeout"].isNull()) commandsObject.timeout = std::stol(valueCommandsCommand["Timeout"].asString()); + if(!valueCommandsCommand["InvokeTimes"].isNull()) + commandsObject.invokeTimes = std::stoi(valueCommandsCommand["InvokeTimes"].asString()); if(!valueCommandsCommand["CreationTime"].isNull()) commandsObject.creationTime = valueCommandsCommand["CreationTime"].asString(); if(!valueCommandsCommand["EnableParameter"].isNull()) diff --git a/ecs/src/model/DescribeInstanceHistoryEventsResult.cc b/ecs/src/model/DescribeInstanceHistoryEventsResult.cc index c58c5fa7e..bdeb6062a 100644 --- a/ecs/src/model/DescribeInstanceHistoryEventsResult.cc +++ b/ecs/src/model/DescribeInstanceHistoryEventsResult.cc @@ -70,6 +70,22 @@ void DescribeInstanceHistoryEventsResult::parse(const std::string &payload) instanceSystemEventSetObject.extendedAttribute.diskId = extendedAttributeNode["DiskId"].asString(); if(!extendedAttributeNode["Device"].isNull()) instanceSystemEventSetObject.extendedAttribute.device = extendedAttributeNode["Device"].asString(); + auto allInactiveDisksNode = extendedAttributeNode["InactiveDisks"]["InactiveDisk"]; + for (auto extendedAttributeNodeInactiveDisksInactiveDisk : allInactiveDisksNode) + { + InstanceSystemEventType::ExtendedAttribute::InactiveDisk inactiveDiskObject; + if(!extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].isNull()) + inactiveDiskObject.creationTime = extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].isNull()) + inactiveDiskObject.releaseTime = extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].isNull()) + inactiveDiskObject.deviceType = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].isNull()) + inactiveDiskObject.deviceCategory = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].isNull()) + inactiveDiskObject.deviceSize = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].asString(); + instanceSystemEventSetObject.extendedAttribute.inactiveDisks.push_back(inactiveDiskObject); + } instanceSystemEventSet_.push_back(instanceSystemEventSetObject); } if(!value["TotalCount"].isNull()) diff --git a/ecs/src/model/DescribeInstancesFullStatusResult.cc b/ecs/src/model/DescribeInstancesFullStatusResult.cc index f4608f088..5157edb40 100644 --- a/ecs/src/model/DescribeInstancesFullStatusResult.cc +++ b/ecs/src/model/DescribeInstancesFullStatusResult.cc @@ -72,6 +72,22 @@ void DescribeInstancesFullStatusResult::parse(const std::string &payload) scheduledSystemEventSetObject.extendedAttribute.diskId = extendedAttributeNode["DiskId"].asString(); if(!extendedAttributeNode["Device"].isNull()) scheduledSystemEventSetObject.extendedAttribute.device = extendedAttributeNode["Device"].asString(); + auto allInactiveDisksNode = extendedAttributeNode["InactiveDisks"]["InactiveDisk"]; + for (auto extendedAttributeNodeInactiveDisksInactiveDisk : allInactiveDisksNode) + { + InstanceFullStatusType::ScheduledSystemEventType::ExtendedAttribute::InactiveDisk inactiveDiskObject; + if(!extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].isNull()) + inactiveDiskObject.creationTime = extendedAttributeNodeInactiveDisksInactiveDisk["CreationTime"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].isNull()) + inactiveDiskObject.releaseTime = extendedAttributeNodeInactiveDisksInactiveDisk["ReleaseTime"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].isNull()) + inactiveDiskObject.deviceType = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceType"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].isNull()) + inactiveDiskObject.deviceCategory = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceCategory"].asString(); + if(!extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].isNull()) + inactiveDiskObject.deviceSize = extendedAttributeNodeInactiveDisksInactiveDisk["DeviceSize"].asString(); + scheduledSystemEventSetObject.extendedAttribute.inactiveDisks.push_back(inactiveDiskObject); + } instanceFullStatusSetObject.scheduledSystemEventSet.push_back(scheduledSystemEventSetObject); } auto statusNode = value["Status"]; diff --git a/ecs/src/model/DescribeInvocationsResult.cc b/ecs/src/model/DescribeInvocationsResult.cc index 3bbcea099..0a447c58e 100644 --- a/ecs/src/model/DescribeInvocationsResult.cc +++ b/ecs/src/model/DescribeInvocationsResult.cc @@ -45,12 +45,16 @@ void DescribeInvocationsResult::parse(const std::string &payload) Invocation invocationsObject; if(!valueInvocationsInvocation["InvokeId"].isNull()) invocationsObject.invokeId = valueInvocationsInvocation["InvokeId"].asString(); + if(!valueInvocationsInvocation["CreationTime"].isNull()) + invocationsObject.creationTime = valueInvocationsInvocation["CreationTime"].asString(); if(!valueInvocationsInvocation["CommandId"].isNull()) invocationsObject.commandId = valueInvocationsInvocation["CommandId"].asString(); if(!valueInvocationsInvocation["CommandType"].isNull()) invocationsObject.commandType = valueInvocationsInvocation["CommandType"].asString(); if(!valueInvocationsInvocation["CommandName"].isNull()) invocationsObject.commandName = valueInvocationsInvocation["CommandName"].asString(); + if(!valueInvocationsInvocation["CommandContent"].isNull()) + invocationsObject.commandContent = valueInvocationsInvocation["CommandContent"].asString(); if(!valueInvocationsInvocation["Frequency"].isNull()) invocationsObject.frequency = valueInvocationsInvocation["Frequency"].asString(); if(!valueInvocationsInvocation["Timed"].isNull()) @@ -59,26 +63,38 @@ void DescribeInvocationsResult::parse(const std::string &payload) invocationsObject.invokeStatus = valueInvocationsInvocation["InvokeStatus"].asString(); if(!valueInvocationsInvocation["Parameters"].isNull()) invocationsObject.parameters = valueInvocationsInvocation["Parameters"].asString(); - if(!valueInvocationsInvocation["CommandContent"].isNull()) - invocationsObject.commandContent = valueInvocationsInvocation["CommandContent"].asString(); auto allInvokeInstancesNode = allInvocationsNode["InvokeInstances"]["InvokeInstance"]; for (auto allInvocationsNodeInvokeInstancesInvokeInstance : allInvokeInstancesNode) { Invocation::InvokeInstance invokeInstancesObject; if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].isNull()) invokeInstancesObject.instanceId = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceId"].asString(); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["Repeats"].isNull()) + invokeInstancesObject.repeats = std::stoi(allInvocationsNodeInvokeInstancesInvokeInstance["Repeats"].asString()); if(!allInvocationsNodeInvokeInstancesInvokeInstance["InstanceInvokeStatus"].isNull()) invokeInstancesObject.instanceInvokeStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InstanceInvokeStatus"].asString(); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].isNull()) + invokeInstancesObject.invocationStatus = allInvocationsNodeInvokeInstancesInvokeInstance["InvocationStatus"].asString(); if(!allInvocationsNodeInvokeInstancesInvokeInstance["Output"].isNull()) invokeInstancesObject.output = allInvocationsNodeInvokeInstancesInvokeInstance["Output"].asString(); if(!allInvocationsNodeInvokeInstancesInvokeInstance["ExitCode"].isNull()) invokeInstancesObject.exitCode = std::stol(allInvocationsNodeInvokeInstancesInvokeInstance["ExitCode"].asString()); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["Dropped"].isNull()) + invokeInstancesObject.dropped = std::stoi(allInvocationsNodeInvokeInstancesInvokeInstance["Dropped"].asString()); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].isNull()) + invokeInstancesObject.errorCode = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorCode"].asString(); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].isNull()) + invokeInstancesObject.errorInfo = allInvocationsNodeInvokeInstancesInvokeInstance["ErrorInfo"].asString(); if(!allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].isNull()) invokeInstancesObject.creationTime = allInvocationsNodeInvokeInstancesInvokeInstance["CreationTime"].asString(); if(!allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].isNull()) invokeInstancesObject.startTime = allInvocationsNodeInvokeInstancesInvokeInstance["StartTime"].asString(); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["StopTime"].isNull()) + invokeInstancesObject.stopTime = allInvocationsNodeInvokeInstancesInvokeInstance["StopTime"].asString(); if(!allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].isNull()) invokeInstancesObject.finishTime = allInvocationsNodeInvokeInstancesInvokeInstance["FinishTime"].asString(); + if(!allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].isNull()) + invokeInstancesObject.updateTime = allInvocationsNodeInvokeInstancesInvokeInstance["UpdateTime"].asString(); invocationsObject.invokeInstances.push_back(invokeInstancesObject); } invocations_.push_back(invocationsObject); diff --git a/ecs/src/model/ModifyPrepayInstanceSpecRequest.cc b/ecs/src/model/ModifyPrepayInstanceSpecRequest.cc index 2bca74430..5d844f24a 100644 --- a/ecs/src/model/ModifyPrepayInstanceSpecRequest.cc +++ b/ecs/src/model/ModifyPrepayInstanceSpecRequest.cc @@ -126,6 +126,17 @@ void ModifyPrepayInstanceSpecRequest::setAutoPay(bool autoPay) setCoreParameter("AutoPay", autoPay ? "true" : "false"); } +bool ModifyPrepayInstanceSpecRequest::getRebootWhenFinished()const +{ + return rebootWhenFinished_; +} + +void ModifyPrepayInstanceSpecRequest::setRebootWhenFinished(bool rebootWhenFinished) +{ + rebootWhenFinished_ = rebootWhenFinished; + setCoreParameter("RebootWhenFinished", rebootWhenFinished ? "true" : "false"); +} + std::string ModifyPrepayInstanceSpecRequest::getResourceOwnerAccount()const { return resourceOwnerAccount_;