diff --git a/CHANGELOG b/CHANGELOG index 52d518a8c..3cf57bf82 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +2018-04-23 Version: 1.6.4 +1, DescribeInstanceHistoryEvents adds parameter instanceEventTypes and instanceEventCycleStatuss. +2, InstanceId parameter is not necessary for DescribeInstanceHistoryEvents now. +3, DescribeInstancesFullStatus adds parameter instanceEventTypes. + 2018-04-23 Version: 1.6.3 1, Add notificationConfiguration. 2, Add standby status. diff --git a/VERSION b/VERSION index f5d2a5858..6463e95e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.3 \ No newline at end of file +1.6.4 \ No newline at end of file diff --git a/ecs/CMakeLists.txt b/ecs/CMakeLists.txt index d28249f11..c894b5b9e 100644 --- a/ecs/CMakeLists.txt +++ b/ecs/CMakeLists.txt @@ -93,6 +93,8 @@ set(ecs_public_header_model include/alibabacloud/ecs/model/DeleteNetworkInterfaceResult.h include/alibabacloud/ecs/model/ModifyInstanceSpecRequest.h include/alibabacloud/ecs/model/ModifyInstanceSpecResult.h + include/alibabacloud/ecs/model/AssignPrivateIpAddressesRequest.h + include/alibabacloud/ecs/model/AssignPrivateIpAddressesResult.h include/alibabacloud/ecs/model/DeleteSnapshotRequest.h include/alibabacloud/ecs/model/DeleteSnapshotResult.h include/alibabacloud/ecs/model/DeleteKeyPairsRequest.h @@ -307,6 +309,8 @@ set(ecs_public_header_model include/alibabacloud/ecs/model/LeaveSecurityGroupResult.h include/alibabacloud/ecs/model/DescribeRenewalPriceRequest.h include/alibabacloud/ecs/model/DescribeRenewalPriceResult.h + include/alibabacloud/ecs/model/UnassignPrivateIpAddressesRequest.h + include/alibabacloud/ecs/model/UnassignPrivateIpAddressesResult.h include/alibabacloud/ecs/model/DescribeInstanceVncPasswdRequest.h include/alibabacloud/ecs/model/DescribeInstanceVncPasswdResult.h include/alibabacloud/ecs/model/DescribeInstanceAutoRenewAttributeRequest.h @@ -580,6 +584,8 @@ set(ecs_src src/model/DeleteNetworkInterfaceResult.cc src/model/ModifyInstanceSpecRequest.cc src/model/ModifyInstanceSpecResult.cc + src/model/AssignPrivateIpAddressesRequest.cc + src/model/AssignPrivateIpAddressesResult.cc src/model/DeleteSnapshotRequest.cc src/model/DeleteSnapshotResult.cc src/model/DeleteKeyPairsRequest.cc @@ -794,6 +800,8 @@ set(ecs_src src/model/LeaveSecurityGroupResult.cc src/model/DescribeRenewalPriceRequest.cc src/model/DescribeRenewalPriceResult.cc + src/model/UnassignPrivateIpAddressesRequest.cc + src/model/UnassignPrivateIpAddressesResult.cc src/model/DescribeInstanceVncPasswdRequest.cc src/model/DescribeInstanceVncPasswdResult.cc src/model/DescribeInstanceAutoRenewAttributeRequest.cc diff --git a/ecs/include/alibabacloud/ecs/EcsClient.h b/ecs/include/alibabacloud/ecs/EcsClient.h index 65b6edb46..a00e460c1 100644 --- a/ecs/include/alibabacloud/ecs/EcsClient.h +++ b/ecs/include/alibabacloud/ecs/EcsClient.h @@ -94,6 +94,8 @@ #include "model/DeleteNetworkInterfaceResult.h" #include "model/ModifyInstanceSpecRequest.h" #include "model/ModifyInstanceSpecResult.h" +#include "model/AssignPrivateIpAddressesRequest.h" +#include "model/AssignPrivateIpAddressesResult.h" #include "model/DeleteSnapshotRequest.h" #include "model/DeleteSnapshotResult.h" #include "model/DeleteKeyPairsRequest.h" @@ -308,6 +310,8 @@ #include "model/LeaveSecurityGroupResult.h" #include "model/DescribeRenewalPriceRequest.h" #include "model/DescribeRenewalPriceResult.h" +#include "model/UnassignPrivateIpAddressesRequest.h" +#include "model/UnassignPrivateIpAddressesResult.h" #include "model/DescribeInstanceVncPasswdRequest.h" #include "model/DescribeInstanceVncPasswdResult.h" #include "model/DescribeInstanceAutoRenewAttributeRequest.h" @@ -623,6 +627,9 @@ namespace AlibabaCloud typedef Outcome ModifyInstanceSpecOutcome; typedef std::future ModifyInstanceSpecOutcomeCallable; typedef std::function&)> ModifyInstanceSpecAsyncHandler; + typedef Outcome AssignPrivateIpAddressesOutcome; + typedef std::future AssignPrivateIpAddressesOutcomeCallable; + typedef std::function&)> AssignPrivateIpAddressesAsyncHandler; typedef Outcome DeleteSnapshotOutcome; typedef std::future DeleteSnapshotOutcomeCallable; typedef std::function&)> DeleteSnapshotAsyncHandler; @@ -944,6 +951,9 @@ namespace AlibabaCloud typedef Outcome DescribeRenewalPriceOutcome; typedef std::future DescribeRenewalPriceOutcomeCallable; typedef std::function&)> DescribeRenewalPriceAsyncHandler; + typedef Outcome UnassignPrivateIpAddressesOutcome; + typedef std::future UnassignPrivateIpAddressesOutcomeCallable; + typedef std::function&)> UnassignPrivateIpAddressesAsyncHandler; typedef Outcome DescribeInstanceVncPasswdOutcome; typedef std::future DescribeInstanceVncPasswdOutcomeCallable; typedef std::function&)> DescribeInstanceVncPasswdAsyncHandler; @@ -1354,6 +1364,9 @@ namespace AlibabaCloud ModifyInstanceSpecOutcome modifyInstanceSpec(const Model::ModifyInstanceSpecRequest &request)const; void modifyInstanceSpecAsync(const Model::ModifyInstanceSpecRequest& request, const ModifyInstanceSpecAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ModifyInstanceSpecOutcomeCallable modifyInstanceSpecCallable(const Model::ModifyInstanceSpecRequest& request) const; + AssignPrivateIpAddressesOutcome assignPrivateIpAddresses(const Model::AssignPrivateIpAddressesRequest &request)const; + void assignPrivateIpAddressesAsync(const Model::AssignPrivateIpAddressesRequest& request, const AssignPrivateIpAddressesAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + AssignPrivateIpAddressesOutcomeCallable assignPrivateIpAddressesCallable(const Model::AssignPrivateIpAddressesRequest& request) const; DeleteSnapshotOutcome deleteSnapshot(const Model::DeleteSnapshotRequest &request)const; void deleteSnapshotAsync(const Model::DeleteSnapshotRequest& request, const DeleteSnapshotAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DeleteSnapshotOutcomeCallable deleteSnapshotCallable(const Model::DeleteSnapshotRequest& request) const; @@ -1675,6 +1688,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; + UnassignPrivateIpAddressesOutcome unassignPrivateIpAddresses(const Model::UnassignPrivateIpAddressesRequest &request)const; + void unassignPrivateIpAddressesAsync(const Model::UnassignPrivateIpAddressesRequest& request, const UnassignPrivateIpAddressesAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + UnassignPrivateIpAddressesOutcomeCallable unassignPrivateIpAddressesCallable(const Model::UnassignPrivateIpAddressesRequest& request) const; DescribeInstanceVncPasswdOutcome describeInstanceVncPasswd(const Model::DescribeInstanceVncPasswdRequest &request)const; void describeInstanceVncPasswdAsync(const Model::DescribeInstanceVncPasswdRequest& request, const DescribeInstanceVncPasswdAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; DescribeInstanceVncPasswdOutcomeCallable describeInstanceVncPasswdCallable(const Model::DescribeInstanceVncPasswdRequest& request) const; diff --git a/ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesRequest.h b/ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesRequest.h new file mode 100644 index 000000000..776e92719 --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesRequest.h @@ -0,0 +1,126 @@ +/* + * 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_ASSIGNPRIVATEIPADDRESSESREQUEST_H_ +#define ALIBABACLOUD_ECS_MODEL_ASSIGNPRIVATEIPADDRESSESREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT AssignPrivateIpAddressesRequest : public RpcServiceRequest + { + + public: + AssignPrivateIpAddressesRequest(); + ~AssignPrivateIpAddressesRequest(); + + long getResourceOwnerId()const; + void setResourceOwnerId(long resourceOwnerId); + long getCallerParentId()const; + void setCallerParentId(long callerParentId); + bool getProxy_original_security_transport()const; + void setProxy_original_security_transport(bool proxy_original_security_transport); + int getSecondaryPrivateIpAddressCount()const; + void setSecondaryPrivateIpAddressCount(int secondaryPrivateIpAddressCount); + std::string getProxy_original_source_ip()const; + void setProxy_original_source_ip(const std::string& proxy_original_source_ip); + std::string getOwnerIdLoginEmail()const; + void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail); + std::string getCallerType()const; + void setCallerType(const std::string& callerType); + 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; + void setRegionId(const std::string& regionId); + bool getEnable()const; + void setEnable(bool enable); + std::string getRequestContent()const; + void setRequestContent(const std::string& requestContent); + std::string getCallerBidEmail()const; + void setCallerBidEmail(const std::string& callerBidEmail); + std::string getCallerUidEmail()const; + void setCallerUidEmail(const std::string& callerUidEmail); + long getCallerUid()const; + void setCallerUid(long callerUid); + std::string getApp_ip()const; + void setApp_ip(const std::string& app_ip); + std::string getResourceOwnerAccount()const; + void setResourceOwnerAccount(const std::string& resourceOwnerAccount); + std::string getOwnerAccount()const; + void setOwnerAccount(const std::string& ownerAccount); + std::string getCallerBid()const; + void setCallerBid(const std::string& callerBid); + long getOwnerId()const; + void setOwnerId(long ownerId); + bool getProxy_trust_transport_info()const; + void setProxy_trust_transport_info(bool proxy_trust_transport_info); + bool getAk_mfa_present()const; + void setAk_mfa_present(bool ak_mfa_present); + bool getSecurity_transport()const; + void setSecurity_transport(bool security_transport); + std::vector getPrivateIpAddress()const; + void setPrivateIpAddress(const std::vector& privateIpAddress); + std::string getRequestId()const; + void setRequestId(const std::string& requestId); + std::string getNetworkInterfaceId()const; + void setNetworkInterfaceId(const std::string& networkInterfaceId); + + private: + long resourceOwnerId_; + long callerParentId_; + bool proxy_original_security_transport_; + int secondaryPrivateIpAddressCount_; + std::string proxy_original_source_ip_; + std::string ownerIdLoginEmail_; + std::string callerType_; + std::string accessKeyId_; + std::string resourceGroupId_; + std::string securityToken_; + std::string regionId_; + bool enable_; + std::string requestContent_; + std::string callerBidEmail_; + std::string callerUidEmail_; + long callerUid_; + std::string app_ip_; + std::string resourceOwnerAccount_; + std::string ownerAccount_; + std::string callerBid_; + long ownerId_; + bool proxy_trust_transport_info_; + bool ak_mfa_present_; + bool security_transport_; + std::vector privateIpAddress_; + std::string requestId_; + std::string networkInterfaceId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_ASSIGNPRIVATEIPADDRESSESREQUEST_H_ \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesResult.h b/ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesResult.h new file mode 100644 index 000000000..4364f6c1f --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/AssignPrivateIpAddressesResult.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_ASSIGNPRIVATEIPADDRESSESRESULT_H_ +#define ALIBABACLOUD_ECS_MODEL_ASSIGNPRIVATEIPADDRESSESRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT AssignPrivateIpAddressesResult : public ServiceResult + { + public: + + + AssignPrivateIpAddressesResult(); + explicit AssignPrivateIpAddressesResult(const std::string &payload); + ~AssignPrivateIpAddressesResult(); + + protected: + void parse(const std::string &payload); + private: + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_ASSIGNPRIVATEIPADDRESSESRESULT_H_ \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h b/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h index dbdd8e24a..6eddddeec 100644 --- a/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h +++ b/ecs/include/alibabacloud/ecs/model/CreateInstanceRequest.h @@ -144,6 +144,8 @@ namespace AlibabaCloud void setSystemDiskDiskName(const std::string& systemDiskDiskName); std::string getRamRoleName()const; void setRamRoleName(const std::string& ramRoleName); + std::string getDedicatedHostId()const; + void setDedicatedHostId(const std::string& dedicatedHostId); std::string getClusterId()const; void setClusterId(const std::string& clusterId); std::vector getDataDisk()const; @@ -209,6 +211,7 @@ namespace AlibabaCloud std::string ownerAccount_; std::string systemDiskDiskName_; std::string ramRoleName_; + std::string dedicatedHostId_; std::string clusterId_; std::vector dataDisk_; std::string tag5Value_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h index 9f4dfdfc6..fac025c97 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeAvailableResourceRequest.h @@ -83,6 +83,8 @@ namespace AlibabaCloud void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; void setOwnerAccount(const std::string& ownerAccount); + std::string getDedicatedHostId()const; + void setDedicatedHostId(const std::string& dedicatedHostId); std::string getCallerBid()const; void setCallerBid(const std::string& callerBid); long getOwnerId()const; @@ -127,6 +129,7 @@ namespace AlibabaCloud std::string app_ip_; std::string resourceOwnerAccount_; std::string ownerAccount_; + std::string dedicatedHostId_; std::string callerBid_; long ownerId_; bool proxy_trust_transport_info_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceAttributeResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceAttributeResult.h index 6db4f3914..1cd10c5aa 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceAttributeResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceAttributeResult.h @@ -46,6 +46,11 @@ namespace AlibabaCloud std::string ipAddress; std::string internetChargeType; }; + struct DedicatedHostAttribute + { + std::string dedicatedHostId; + std::string dedicatedHostName; + }; struct LockReason { std::string lockReason; @@ -74,6 +79,7 @@ namespace AlibabaCloud std::string getInstanceId()const; std::string getClusterId()const; std::string getStoppedMode()const; + DedicatedHostAttribute getDedicatedHostAttribute()const; VpcAttributes getVpcAttributes()const; std::vector getSecurityGroupIds()const; std::vector getOperationLocks()const; @@ -107,6 +113,7 @@ namespace AlibabaCloud std::string instanceId_; std::string clusterId_; std::string stoppedMode_; + DedicatedHostAttribute dedicatedHostAttribute_; VpcAttributes vpcAttributes_; std::vector securityGroupIds_; std::vector operationLocks_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsRequest.h index 3772e8a5b..dc9603e71 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsRequest.h @@ -69,6 +69,8 @@ namespace AlibabaCloud void setPageSize(int pageSize); std::string getCallerBidEmail()const; void setCallerBidEmail(const std::string& callerBidEmail); + std::vector getInstanceEventCycleStatus()const; + void setInstanceEventCycleStatus(const std::vector& instanceEventCycleStatus); std::string getCallerUidEmail()const; void setCallerUidEmail(const std::string& callerUidEmail); std::string getEventPublishTimeEnd()const; @@ -77,6 +79,8 @@ namespace AlibabaCloud void setCallerUid(long callerUid); std::string getApp_ip()const; void setApp_ip(const std::string& app_ip); + std::vector getInstanceEventType()const; + void setInstanceEventType(const std::vector& instanceEventType); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -122,10 +126,12 @@ namespace AlibabaCloud std::string requestContent_; int pageSize_; std::string callerBidEmail_; + std::vector instanceEventCycleStatus_; std::string callerUidEmail_; std::string eventPublishTimeEnd_; long callerUid_; std::string app_ip_; + std::vector instanceEventType_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string notBeforeStart_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h index dc2278499..216ad6d4c 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstanceHistoryEventsResult.h @@ -39,6 +39,13 @@ namespace AlibabaCloud int code; std::string name; }; + struct EventCycleStatus + { + int code; + std::string name; + }; + std::string eventFinishTime; + EventCycleStatus eventCycleStatus; std::string eventPublishTime; EventType eventType; std::string instanceId; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusRequest.h b/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusRequest.h index c74f4398a..c9cfc7d20 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusRequest.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstancesFullStatusRequest.h @@ -75,6 +75,8 @@ namespace AlibabaCloud void setCallerUid(long callerUid); std::string getApp_ip()const; void setApp_ip(const std::string& app_ip); + std::vector getInstanceEventType()const; + void setInstanceEventType(const std::vector& instanceEventType); std::string getResourceOwnerAccount()const; void setResourceOwnerAccount(const std::string& resourceOwnerAccount); std::string getOwnerAccount()const; @@ -127,6 +129,7 @@ namespace AlibabaCloud std::string eventPublishTimeEnd_; long callerUid_; std::string app_ip_; + std::vector instanceEventType_; std::string resourceOwnerAccount_; std::string ownerAccount_; std::string notBeforeStart_; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h index a0a942046..b7603438f 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeInstancesResult.h @@ -49,6 +49,11 @@ namespace AlibabaCloud bool isSupportUnassociate; std::string internetChargeType; }; + struct DedicatedHostAttribute + { + std::string dedicatedHostId; + std::string dedicatedHostName; + }; struct NetworkInterface { std::string primaryIpAddress; @@ -108,6 +113,7 @@ namespace AlibabaCloud std::string zoneId; std::string clusterId; std::string hpcClusterId; + DedicatedHostAttribute dedicatedHostAttribute; int gPUAmount; std::vector operationLocks; std::vector rdmaIpAddress; diff --git a/ecs/include/alibabacloud/ecs/model/DescribeZonesResult.h b/ecs/include/alibabacloud/ecs/model/DescribeZonesResult.h index b25bf63d3..dd9043836 100644 --- a/ecs/include/alibabacloud/ecs/model/DescribeZonesResult.h +++ b/ecs/include/alibabacloud/ecs/model/DescribeZonesResult.h @@ -44,8 +44,10 @@ namespace AlibabaCloud std::vector instanceTypeFamilies; std::vector dataDiskCategories; }; + std::vector dedicatedHostGenerations; std::vector availableInstanceTypes; std::string zoneId; + std::vector availableDedicatedHostTypes; std::vector availableResources; std::vector availableDiskCategories; std::string localName; diff --git a/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h b/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h index 64429b748..cf3bf1296 100644 --- a/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h +++ b/ecs/include/alibabacloud/ecs/model/RunInstancesRequest.h @@ -160,6 +160,8 @@ namespace AlibabaCloud void setRamRoleName(const std::string& ramRoleName); std::string getAutoReleaseTime()const; void setAutoReleaseTime(const std::string& autoReleaseTime); + std::string getDedicatedHostId()const; + void setDedicatedHostId(const std::string& dedicatedHostId); std::string getCallerBid()const; void setCallerBid(const std::string& callerBid); std::vector getDataDisk()const; @@ -223,6 +225,7 @@ namespace AlibabaCloud std::string systemDiskDiskName_; std::string ramRoleName_; std::string autoReleaseTime_; + std::string dedicatedHostId_; std::string callerBid_; std::vector dataDisk_; bool proxy_trust_transport_info_; diff --git a/ecs/include/alibabacloud/ecs/model/UnassignPrivateIpAddressesRequest.h b/ecs/include/alibabacloud/ecs/model/UnassignPrivateIpAddressesRequest.h new file mode 100644 index 000000000..d602d165f --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/UnassignPrivateIpAddressesRequest.h @@ -0,0 +1,123 @@ +/* + * 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_UNASSIGNPRIVATEIPADDRESSESREQUEST_H_ +#define ALIBABACLOUD_ECS_MODEL_UNASSIGNPRIVATEIPADDRESSESREQUEST_H_ + +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT UnassignPrivateIpAddressesRequest : public RpcServiceRequest + { + + public: + UnassignPrivateIpAddressesRequest(); + ~UnassignPrivateIpAddressesRequest(); + + long getResourceOwnerId()const; + void setResourceOwnerId(long resourceOwnerId); + long getCallerParentId()const; + void setCallerParentId(long callerParentId); + bool getProxy_original_security_transport()const; + void setProxy_original_security_transport(bool proxy_original_security_transport); + std::string getProxy_original_source_ip()const; + void setProxy_original_source_ip(const std::string& proxy_original_source_ip); + std::string getOwnerIdLoginEmail()const; + void setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail); + std::string getCallerType()const; + void setCallerType(const std::string& callerType); + 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; + void setRegionId(const std::string& regionId); + bool getEnable()const; + void setEnable(bool enable); + std::string getRequestContent()const; + void setRequestContent(const std::string& requestContent); + std::string getCallerBidEmail()const; + void setCallerBidEmail(const std::string& callerBidEmail); + std::string getCallerUidEmail()const; + void setCallerUidEmail(const std::string& callerUidEmail); + long getCallerUid()const; + void setCallerUid(long callerUid); + std::string getApp_ip()const; + void setApp_ip(const std::string& app_ip); + std::string getResourceOwnerAccount()const; + void setResourceOwnerAccount(const std::string& resourceOwnerAccount); + std::string getOwnerAccount()const; + void setOwnerAccount(const std::string& ownerAccount); + std::string getCallerBid()const; + void setCallerBid(const std::string& callerBid); + long getOwnerId()const; + void setOwnerId(long ownerId); + bool getProxy_trust_transport_info()const; + void setProxy_trust_transport_info(bool proxy_trust_transport_info); + bool getAk_mfa_present()const; + void setAk_mfa_present(bool ak_mfa_present); + bool getSecurity_transport()const; + void setSecurity_transport(bool security_transport); + std::vector getPrivateIpAddress()const; + void setPrivateIpAddress(const std::vector& privateIpAddress); + std::string getRequestId()const; + void setRequestId(const std::string& requestId); + std::string getNetworkInterfaceId()const; + void setNetworkInterfaceId(const std::string& networkInterfaceId); + + private: + long resourceOwnerId_; + long callerParentId_; + bool proxy_original_security_transport_; + std::string proxy_original_source_ip_; + std::string ownerIdLoginEmail_; + std::string callerType_; + std::string accessKeyId_; + std::string resourceGroupId_; + std::string securityToken_; + std::string regionId_; + bool enable_; + std::string requestContent_; + std::string callerBidEmail_; + std::string callerUidEmail_; + long callerUid_; + std::string app_ip_; + std::string resourceOwnerAccount_; + std::string ownerAccount_; + std::string callerBid_; + long ownerId_; + bool proxy_trust_transport_info_; + bool ak_mfa_present_; + bool security_transport_; + std::vector privateIpAddress_; + std::string requestId_; + std::string networkInterfaceId_; + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_UNASSIGNPRIVATEIPADDRESSESREQUEST_H_ \ No newline at end of file diff --git a/ecs/include/alibabacloud/ecs/model/UnassignPrivateIpAddressesResult.h b/ecs/include/alibabacloud/ecs/model/UnassignPrivateIpAddressesResult.h new file mode 100644 index 000000000..6c99e03df --- /dev/null +++ b/ecs/include/alibabacloud/ecs/model/UnassignPrivateIpAddressesResult.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_UNASSIGNPRIVATEIPADDRESSESRESULT_H_ +#define ALIBABACLOUD_ECS_MODEL_UNASSIGNPRIVATEIPADDRESSESRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace Ecs + { + namespace Model + { + class ALIBABACLOUD_ECS_EXPORT UnassignPrivateIpAddressesResult : public ServiceResult + { + public: + + + UnassignPrivateIpAddressesResult(); + explicit UnassignPrivateIpAddressesResult(const std::string &payload); + ~UnassignPrivateIpAddressesResult(); + + protected: + void parse(const std::string &payload); + private: + + }; + } + } +} +#endif // !ALIBABACLOUD_ECS_MODEL_UNASSIGNPRIVATEIPADDRESSESRESULT_H_ \ No newline at end of file diff --git a/ecs/src/EcsClient.cc b/ecs/src/EcsClient.cc index 08bae1b23..631a57c2c 100644 --- a/ecs/src/EcsClient.cc +++ b/ecs/src/EcsClient.cc @@ -1347,6 +1347,42 @@ EcsClient::ModifyInstanceSpecOutcomeCallable EcsClient::modifyInstanceSpecCallab return task->get_future(); } +EcsClient::AssignPrivateIpAddressesOutcome EcsClient::assignPrivateIpAddresses(const AssignPrivateIpAddressesRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return AssignPrivateIpAddressesOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return AssignPrivateIpAddressesOutcome(AssignPrivateIpAddressesResult(outcome.result())); + else + return AssignPrivateIpAddressesOutcome(outcome.error()); +} + +void EcsClient::assignPrivateIpAddressesAsync(const AssignPrivateIpAddressesRequest& request, const AssignPrivateIpAddressesAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, assignPrivateIpAddresses(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EcsClient::AssignPrivateIpAddressesOutcomeCallable EcsClient::assignPrivateIpAddressesCallable(const AssignPrivateIpAddressesRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->assignPrivateIpAddresses(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EcsClient::DeleteSnapshotOutcome EcsClient::deleteSnapshot(const DeleteSnapshotRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -5199,6 +5235,42 @@ EcsClient::DescribeRenewalPriceOutcomeCallable EcsClient::describeRenewalPriceCa return task->get_future(); } +EcsClient::UnassignPrivateIpAddressesOutcome EcsClient::unassignPrivateIpAddresses(const UnassignPrivateIpAddressesRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return UnassignPrivateIpAddressesOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return UnassignPrivateIpAddressesOutcome(UnassignPrivateIpAddressesResult(outcome.result())); + else + return UnassignPrivateIpAddressesOutcome(outcome.error()); +} + +void EcsClient::unassignPrivateIpAddressesAsync(const UnassignPrivateIpAddressesRequest& request, const UnassignPrivateIpAddressesAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, unassignPrivateIpAddresses(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +EcsClient::UnassignPrivateIpAddressesOutcomeCallable EcsClient::unassignPrivateIpAddressesCallable(const UnassignPrivateIpAddressesRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->unassignPrivateIpAddresses(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + EcsClient::DescribeInstanceVncPasswdOutcome EcsClient::describeInstanceVncPasswd(const DescribeInstanceVncPasswdRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/ecs/src/model/AssignPrivateIpAddressesRequest.cc b/ecs/src/model/AssignPrivateIpAddressesRequest.cc new file mode 100644 index 000000000..43f1c6f2b --- /dev/null +++ b/ecs/src/model/AssignPrivateIpAddressesRequest.cc @@ -0,0 +1,325 @@ +/* + * 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::AssignPrivateIpAddressesRequest; + +AssignPrivateIpAddressesRequest::AssignPrivateIpAddressesRequest() : + RpcServiceRequest("ecs", "2014-05-26", "AssignPrivateIpAddresses") +{} + +AssignPrivateIpAddressesRequest::~AssignPrivateIpAddressesRequest() +{} + +long AssignPrivateIpAddressesRequest::getResourceOwnerId()const +{ + return resourceOwnerId_; +} + +void AssignPrivateIpAddressesRequest::setResourceOwnerId(long resourceOwnerId) +{ + resourceOwnerId_ = resourceOwnerId; + setParameter("ResourceOwnerId", std::to_string(resourceOwnerId)); +} + +long AssignPrivateIpAddressesRequest::getCallerParentId()const +{ + return callerParentId_; +} + +void AssignPrivateIpAddressesRequest::setCallerParentId(long callerParentId) +{ + callerParentId_ = callerParentId; + setParameter("CallerParentId", std::to_string(callerParentId)); +} + +bool AssignPrivateIpAddressesRequest::getProxy_original_security_transport()const +{ + return proxy_original_security_transport_; +} + +void AssignPrivateIpAddressesRequest::setProxy_original_security_transport(bool proxy_original_security_transport) +{ + proxy_original_security_transport_ = proxy_original_security_transport; + setParameter("Proxy_original_security_transport", std::to_string(proxy_original_security_transport)); +} + +int AssignPrivateIpAddressesRequest::getSecondaryPrivateIpAddressCount()const +{ + return secondaryPrivateIpAddressCount_; +} + +void AssignPrivateIpAddressesRequest::setSecondaryPrivateIpAddressCount(int secondaryPrivateIpAddressCount) +{ + secondaryPrivateIpAddressCount_ = secondaryPrivateIpAddressCount; + setParameter("SecondaryPrivateIpAddressCount", std::to_string(secondaryPrivateIpAddressCount)); +} + +std::string AssignPrivateIpAddressesRequest::getProxy_original_source_ip()const +{ + return proxy_original_source_ip_; +} + +void AssignPrivateIpAddressesRequest::setProxy_original_source_ip(const std::string& proxy_original_source_ip) +{ + proxy_original_source_ip_ = proxy_original_source_ip; + setParameter("Proxy_original_source_ip", proxy_original_source_ip); +} + +std::string AssignPrivateIpAddressesRequest::getOwnerIdLoginEmail()const +{ + return ownerIdLoginEmail_; +} + +void AssignPrivateIpAddressesRequest::setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail) +{ + ownerIdLoginEmail_ = ownerIdLoginEmail; + setParameter("OwnerIdLoginEmail", ownerIdLoginEmail); +} + +std::string AssignPrivateIpAddressesRequest::getCallerType()const +{ + return callerType_; +} + +void AssignPrivateIpAddressesRequest::setCallerType(const std::string& callerType) +{ + callerType_ = callerType; + setParameter("CallerType", callerType); +} + +std::string AssignPrivateIpAddressesRequest::getAccessKeyId()const +{ + return accessKeyId_; +} + +void AssignPrivateIpAddressesRequest::setAccessKeyId(const std::string& accessKeyId) +{ + accessKeyId_ = accessKeyId; + setParameter("AccessKeyId", accessKeyId); +} + +std::string AssignPrivateIpAddressesRequest::getResourceGroupId()const +{ + return resourceGroupId_; +} + +void AssignPrivateIpAddressesRequest::setResourceGroupId(const std::string& resourceGroupId) +{ + resourceGroupId_ = resourceGroupId; + setParameter("ResourceGroupId", resourceGroupId); +} + +std::string AssignPrivateIpAddressesRequest::getSecurityToken()const +{ + return securityToken_; +} + +void AssignPrivateIpAddressesRequest::setSecurityToken(const std::string& securityToken) +{ + securityToken_ = securityToken; + setParameter("SecurityToken", securityToken); +} + +std::string AssignPrivateIpAddressesRequest::getRegionId()const +{ + return regionId_; +} + +void AssignPrivateIpAddressesRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + +bool AssignPrivateIpAddressesRequest::getEnable()const +{ + return enable_; +} + +void AssignPrivateIpAddressesRequest::setEnable(bool enable) +{ + enable_ = enable; + setParameter("Enable", std::to_string(enable)); +} + +std::string AssignPrivateIpAddressesRequest::getRequestContent()const +{ + return requestContent_; +} + +void AssignPrivateIpAddressesRequest::setRequestContent(const std::string& requestContent) +{ + requestContent_ = requestContent; + setParameter("RequestContent", requestContent); +} + +std::string AssignPrivateIpAddressesRequest::getCallerBidEmail()const +{ + return callerBidEmail_; +} + +void AssignPrivateIpAddressesRequest::setCallerBidEmail(const std::string& callerBidEmail) +{ + callerBidEmail_ = callerBidEmail; + setParameter("CallerBidEmail", callerBidEmail); +} + +std::string AssignPrivateIpAddressesRequest::getCallerUidEmail()const +{ + return callerUidEmail_; +} + +void AssignPrivateIpAddressesRequest::setCallerUidEmail(const std::string& callerUidEmail) +{ + callerUidEmail_ = callerUidEmail; + setParameter("CallerUidEmail", callerUidEmail); +} + +long AssignPrivateIpAddressesRequest::getCallerUid()const +{ + return callerUid_; +} + +void AssignPrivateIpAddressesRequest::setCallerUid(long callerUid) +{ + callerUid_ = callerUid; + setParameter("CallerUid", std::to_string(callerUid)); +} + +std::string AssignPrivateIpAddressesRequest::getApp_ip()const +{ + return app_ip_; +} + +void AssignPrivateIpAddressesRequest::setApp_ip(const std::string& app_ip) +{ + app_ip_ = app_ip; + setParameter("App_ip", app_ip); +} + +std::string AssignPrivateIpAddressesRequest::getResourceOwnerAccount()const +{ + return resourceOwnerAccount_; +} + +void AssignPrivateIpAddressesRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount) +{ + resourceOwnerAccount_ = resourceOwnerAccount; + setParameter("ResourceOwnerAccount", resourceOwnerAccount); +} + +std::string AssignPrivateIpAddressesRequest::getOwnerAccount()const +{ + return ownerAccount_; +} + +void AssignPrivateIpAddressesRequest::setOwnerAccount(const std::string& ownerAccount) +{ + ownerAccount_ = ownerAccount; + setParameter("OwnerAccount", ownerAccount); +} + +std::string AssignPrivateIpAddressesRequest::getCallerBid()const +{ + return callerBid_; +} + +void AssignPrivateIpAddressesRequest::setCallerBid(const std::string& callerBid) +{ + callerBid_ = callerBid; + setParameter("CallerBid", callerBid); +} + +long AssignPrivateIpAddressesRequest::getOwnerId()const +{ + return ownerId_; +} + +void AssignPrivateIpAddressesRequest::setOwnerId(long ownerId) +{ + ownerId_ = ownerId; + setParameter("OwnerId", std::to_string(ownerId)); +} + +bool AssignPrivateIpAddressesRequest::getProxy_trust_transport_info()const +{ + return proxy_trust_transport_info_; +} + +void AssignPrivateIpAddressesRequest::setProxy_trust_transport_info(bool proxy_trust_transport_info) +{ + proxy_trust_transport_info_ = proxy_trust_transport_info; + setParameter("Proxy_trust_transport_info", std::to_string(proxy_trust_transport_info)); +} + +bool AssignPrivateIpAddressesRequest::getAk_mfa_present()const +{ + return ak_mfa_present_; +} + +void AssignPrivateIpAddressesRequest::setAk_mfa_present(bool ak_mfa_present) +{ + ak_mfa_present_ = ak_mfa_present; + setParameter("Ak_mfa_present", std::to_string(ak_mfa_present)); +} + +bool AssignPrivateIpAddressesRequest::getSecurity_transport()const +{ + return security_transport_; +} + +void AssignPrivateIpAddressesRequest::setSecurity_transport(bool security_transport) +{ + security_transport_ = security_transport; + setParameter("Security_transport", std::to_string(security_transport)); +} + +std::vector AssignPrivateIpAddressesRequest::getPrivateIpAddress()const +{ + return privateIpAddress_; +} + +void AssignPrivateIpAddressesRequest::setPrivateIpAddress(const std::vector& privateIpAddress) +{ + privateIpAddress_ = privateIpAddress; + for(int i = 0; i!= privateIpAddress.size(); i++) + setParameter("PrivateIpAddress."+ std::to_string(i), privateIpAddress.at(i)); +} + +std::string AssignPrivateIpAddressesRequest::getRequestId()const +{ + return requestId_; +} + +void AssignPrivateIpAddressesRequest::setRequestId(const std::string& requestId) +{ + requestId_ = requestId; + setParameter("RequestId", requestId); +} + +std::string AssignPrivateIpAddressesRequest::getNetworkInterfaceId()const +{ + return networkInterfaceId_; +} + +void AssignPrivateIpAddressesRequest::setNetworkInterfaceId(const std::string& networkInterfaceId) +{ + networkInterfaceId_ = networkInterfaceId; + setParameter("NetworkInterfaceId", networkInterfaceId); +} + diff --git a/ecs/src/model/AssignPrivateIpAddressesResult.cc b/ecs/src/model/AssignPrivateIpAddressesResult.cc new file mode 100644 index 000000000..7ae26e10a --- /dev/null +++ b/ecs/src/model/AssignPrivateIpAddressesResult.cc @@ -0,0 +1,45 @@ +/* + * 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; + +AssignPrivateIpAddressesResult::AssignPrivateIpAddressesResult() : + ServiceResult() +{} + +AssignPrivateIpAddressesResult::AssignPrivateIpAddressesResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +AssignPrivateIpAddressesResult::~AssignPrivateIpAddressesResult() +{} + +void AssignPrivateIpAddressesResult::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/CreateInstanceRequest.cc b/ecs/src/model/CreateInstanceRequest.cc index bda23701e..83cee5308 100644 --- a/ecs/src/model/CreateInstanceRequest.cc +++ b/ecs/src/model/CreateInstanceRequest.cc @@ -564,6 +564,17 @@ void CreateInstanceRequest::setRamRoleName(const std::string& ramRoleName) setParameter("RamRoleName", ramRoleName); } +std::string CreateInstanceRequest::getDedicatedHostId()const +{ + return dedicatedHostId_; +} + +void CreateInstanceRequest::setDedicatedHostId(const std::string& dedicatedHostId) +{ + dedicatedHostId_ = dedicatedHostId; + setParameter("DedicatedHostId", dedicatedHostId); +} + std::string CreateInstanceRequest::getClusterId()const { return clusterId_; diff --git a/ecs/src/model/DescribeAvailableResourceRequest.cc b/ecs/src/model/DescribeAvailableResourceRequest.cc index 9d6dd547f..1864d50f4 100644 --- a/ecs/src/model/DescribeAvailableResourceRequest.cc +++ b/ecs/src/model/DescribeAvailableResourceRequest.cc @@ -289,6 +289,17 @@ void DescribeAvailableResourceRequest::setOwnerAccount(const std::string& ownerA setParameter("OwnerAccount", ownerAccount); } +std::string DescribeAvailableResourceRequest::getDedicatedHostId()const +{ + return dedicatedHostId_; +} + +void DescribeAvailableResourceRequest::setDedicatedHostId(const std::string& dedicatedHostId) +{ + dedicatedHostId_ = dedicatedHostId; + setParameter("DedicatedHostId", dedicatedHostId); +} + std::string DescribeAvailableResourceRequest::getCallerBid()const { return callerBid_; diff --git a/ecs/src/model/DescribeInstanceAttributeResult.cc b/ecs/src/model/DescribeInstanceAttributeResult.cc index 2e675ed42..e97083b76 100644 --- a/ecs/src/model/DescribeInstanceAttributeResult.cc +++ b/ecs/src/model/DescribeInstanceAttributeResult.cc @@ -67,6 +67,11 @@ void DescribeInstanceAttributeResult::parse(const std::string &payload) eipAddress_.bandwidth = std::stoi(eipAddressNode["Bandwidth"].asString()); if(!eipAddressNode["InternetChargeType"].isNull()) eipAddress_.internetChargeType = eipAddressNode["InternetChargeType"].asString(); + auto dedicatedHostAttributeNode = value["DedicatedHostAttribute"]; + if(!dedicatedHostAttributeNode["DedicatedHostId"].isNull()) + dedicatedHostAttribute_.dedicatedHostId = dedicatedHostAttributeNode["DedicatedHostId"].asString(); + if(!dedicatedHostAttributeNode["DedicatedHostName"].isNull()) + dedicatedHostAttribute_.dedicatedHostName = dedicatedHostAttributeNode["DedicatedHostName"].asString(); auto allSecurityGroupIds = value["SecurityGroupIds"]["SecurityGroupId"]; for (const auto &item : allSecurityGroupIds) securityGroupIds_.push_back(item.asString()); @@ -220,6 +225,11 @@ std::string DescribeInstanceAttributeResult::getStoppedMode()const return stoppedMode_; } +DescribeInstanceAttributeResult::DedicatedHostAttribute DescribeInstanceAttributeResult::getDedicatedHostAttribute()const +{ + return dedicatedHostAttribute_; +} + DescribeInstanceAttributeResult::VpcAttributes DescribeInstanceAttributeResult::getVpcAttributes()const { return vpcAttributes_; diff --git a/ecs/src/model/DescribeInstanceHistoryEventsRequest.cc b/ecs/src/model/DescribeInstanceHistoryEventsRequest.cc index bd67e8405..c2662013a 100644 --- a/ecs/src/model/DescribeInstanceHistoryEventsRequest.cc +++ b/ecs/src/model/DescribeInstanceHistoryEventsRequest.cc @@ -213,6 +213,18 @@ void DescribeInstanceHistoryEventsRequest::setCallerBidEmail(const std::string& setParameter("CallerBidEmail", callerBidEmail); } +std::vector DescribeInstanceHistoryEventsRequest::getInstanceEventCycleStatus()const +{ + return instanceEventCycleStatus_; +} + +void DescribeInstanceHistoryEventsRequest::setInstanceEventCycleStatus(const std::vector& instanceEventCycleStatus) +{ + instanceEventCycleStatus_ = instanceEventCycleStatus; + for(int i = 0; i!= instanceEventCycleStatus.size(); i++) + setParameter("InstanceEventCycleStatus."+ std::to_string(i), instanceEventCycleStatus.at(i)); +} + std::string DescribeInstanceHistoryEventsRequest::getCallerUidEmail()const { return callerUidEmail_; @@ -257,6 +269,18 @@ void DescribeInstanceHistoryEventsRequest::setApp_ip(const std::string& app_ip) setParameter("App_ip", app_ip); } +std::vector DescribeInstanceHistoryEventsRequest::getInstanceEventType()const +{ + return instanceEventType_; +} + +void DescribeInstanceHistoryEventsRequest::setInstanceEventType(const std::vector& instanceEventType) +{ + instanceEventType_ = instanceEventType; + for(int i = 0; i!= instanceEventType.size(); i++) + setParameter("InstanceEventType."+ std::to_string(i), instanceEventType.at(i)); +} + std::string DescribeInstanceHistoryEventsRequest::getResourceOwnerAccount()const { return resourceOwnerAccount_; diff --git a/ecs/src/model/DescribeInstanceHistoryEventsResult.cc b/ecs/src/model/DescribeInstanceHistoryEventsResult.cc index 12d48163c..a7d39563e 100644 --- a/ecs/src/model/DescribeInstanceHistoryEventsResult.cc +++ b/ecs/src/model/DescribeInstanceHistoryEventsResult.cc @@ -52,11 +52,18 @@ void DescribeInstanceHistoryEventsResult::parse(const std::string &payload) instanceSystemEventSetObject.eventPublishTime = value["EventPublishTime"].asString(); if(!value["NotBefore"].isNull()) instanceSystemEventSetObject.notBefore = value["NotBefore"].asString(); + if(!value["EventFinishTime"].isNull()) + instanceSystemEventSetObject.eventFinishTime = value["EventFinishTime"].asString(); auto eventTypeNode = value["EventType"]; if(!eventTypeNode["Code"].isNull()) instanceSystemEventSetObject.eventType.code = std::stoi(eventTypeNode["Code"].asString()); if(!eventTypeNode["Name"].isNull()) instanceSystemEventSetObject.eventType.name = eventTypeNode["Name"].asString(); + auto eventCycleStatusNode = value["EventCycleStatus"]; + if(!eventCycleStatusNode["Code"].isNull()) + instanceSystemEventSetObject.eventCycleStatus.code = std::stoi(eventCycleStatusNode["Code"].asString()); + if(!eventCycleStatusNode["Name"].isNull()) + instanceSystemEventSetObject.eventCycleStatus.name = eventCycleStatusNode["Name"].asString(); instanceSystemEventSet_.push_back(instanceSystemEventSetObject); } if(!value["TotalCount"].isNull()) diff --git a/ecs/src/model/DescribeInstancesFullStatusRequest.cc b/ecs/src/model/DescribeInstancesFullStatusRequest.cc index 7ac9445e1..1a8732bba 100644 --- a/ecs/src/model/DescribeInstancesFullStatusRequest.cc +++ b/ecs/src/model/DescribeInstancesFullStatusRequest.cc @@ -246,6 +246,18 @@ void DescribeInstancesFullStatusRequest::setApp_ip(const std::string& app_ip) setParameter("App_ip", app_ip); } +std::vector DescribeInstancesFullStatusRequest::getInstanceEventType()const +{ + return instanceEventType_; +} + +void DescribeInstancesFullStatusRequest::setInstanceEventType(const std::vector& instanceEventType) +{ + instanceEventType_ = instanceEventType; + for(int i = 0; i!= instanceEventType.size(); i++) + setParameter("InstanceEventType."+ std::to_string(i), instanceEventType.at(i)); +} + std::string DescribeInstancesFullStatusRequest::getResourceOwnerAccount()const { return resourceOwnerAccount_; diff --git a/ecs/src/model/DescribeInstancesResult.cc b/ecs/src/model/DescribeInstancesResult.cc index 5c053aed9..c79886a89 100644 --- a/ecs/src/model/DescribeInstancesResult.cc +++ b/ecs/src/model/DescribeInstancesResult.cc @@ -177,6 +177,11 @@ void DescribeInstancesResult::parse(const std::string &payload) instancesObject.eipAddress.internetChargeType = eipAddressNode["InternetChargeType"].asString(); if(!eipAddressNode["IsSupportUnassociate"].isNull()) instancesObject.eipAddress.isSupportUnassociate = eipAddressNode["IsSupportUnassociate"].asString() == "true"; + auto dedicatedHostAttributeNode = value["DedicatedHostAttribute"]; + if(!dedicatedHostAttributeNode["DedicatedHostId"].isNull()) + instancesObject.dedicatedHostAttribute.dedicatedHostId = dedicatedHostAttributeNode["DedicatedHostId"].asString(); + if(!dedicatedHostAttributeNode["DedicatedHostName"].isNull()) + instancesObject.dedicatedHostAttribute.dedicatedHostName = dedicatedHostAttributeNode["DedicatedHostName"].asString(); auto allSecurityGroupIds = value["SecurityGroupIds"]["SecurityGroupId"]; for (auto value : allSecurityGroupIds) instancesObject.securityGroupIds.push_back(value.asString()); diff --git a/ecs/src/model/DescribeZonesResult.cc b/ecs/src/model/DescribeZonesResult.cc index d06870731..feaa3d1b4 100644 --- a/ecs/src/model/DescribeZonesResult.cc +++ b/ecs/src/model/DescribeZonesResult.cc @@ -86,6 +86,12 @@ void DescribeZonesResult::parse(const std::string &payload) auto allAvailableVolumeCategories = value["AvailableVolumeCategories"]["VolumeCategories"]; for (auto value : allAvailableVolumeCategories) zonesObject.availableVolumeCategories.push_back(value.asString()); + auto allAvailableDedicatedHostTypes = value["AvailableDedicatedHostTypes"]["DedicatedHostType"]; + for (auto value : allAvailableDedicatedHostTypes) + zonesObject.availableDedicatedHostTypes.push_back(value.asString()); + auto allDedicatedHostGenerations = value["DedicatedHostGenerations"]["DedicatedHostGeneration"]; + for (auto value : allDedicatedHostGenerations) + zonesObject.dedicatedHostGenerations.push_back(value.asString()); zones_.push_back(zonesObject); } diff --git a/ecs/src/model/RunInstancesRequest.cc b/ecs/src/model/RunInstancesRequest.cc index 6f565fe38..053fab233 100644 --- a/ecs/src/model/RunInstancesRequest.cc +++ b/ecs/src/model/RunInstancesRequest.cc @@ -601,6 +601,17 @@ void RunInstancesRequest::setAutoReleaseTime(const std::string& autoReleaseTime) setParameter("AutoReleaseTime", autoReleaseTime); } +std::string RunInstancesRequest::getDedicatedHostId()const +{ + return dedicatedHostId_; +} + +void RunInstancesRequest::setDedicatedHostId(const std::string& dedicatedHostId) +{ + dedicatedHostId_ = dedicatedHostId; + setParameter("DedicatedHostId", dedicatedHostId); +} + std::string RunInstancesRequest::getCallerBid()const { return callerBid_; diff --git a/ecs/src/model/UnassignPrivateIpAddressesRequest.cc b/ecs/src/model/UnassignPrivateIpAddressesRequest.cc new file mode 100644 index 000000000..737d50664 --- /dev/null +++ b/ecs/src/model/UnassignPrivateIpAddressesRequest.cc @@ -0,0 +1,314 @@ +/* + * 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::UnassignPrivateIpAddressesRequest; + +UnassignPrivateIpAddressesRequest::UnassignPrivateIpAddressesRequest() : + RpcServiceRequest("ecs", "2014-05-26", "UnassignPrivateIpAddresses") +{} + +UnassignPrivateIpAddressesRequest::~UnassignPrivateIpAddressesRequest() +{} + +long UnassignPrivateIpAddressesRequest::getResourceOwnerId()const +{ + return resourceOwnerId_; +} + +void UnassignPrivateIpAddressesRequest::setResourceOwnerId(long resourceOwnerId) +{ + resourceOwnerId_ = resourceOwnerId; + setParameter("ResourceOwnerId", std::to_string(resourceOwnerId)); +} + +long UnassignPrivateIpAddressesRequest::getCallerParentId()const +{ + return callerParentId_; +} + +void UnassignPrivateIpAddressesRequest::setCallerParentId(long callerParentId) +{ + callerParentId_ = callerParentId; + setParameter("CallerParentId", std::to_string(callerParentId)); +} + +bool UnassignPrivateIpAddressesRequest::getProxy_original_security_transport()const +{ + return proxy_original_security_transport_; +} + +void UnassignPrivateIpAddressesRequest::setProxy_original_security_transport(bool proxy_original_security_transport) +{ + proxy_original_security_transport_ = proxy_original_security_transport; + setParameter("Proxy_original_security_transport", std::to_string(proxy_original_security_transport)); +} + +std::string UnassignPrivateIpAddressesRequest::getProxy_original_source_ip()const +{ + return proxy_original_source_ip_; +} + +void UnassignPrivateIpAddressesRequest::setProxy_original_source_ip(const std::string& proxy_original_source_ip) +{ + proxy_original_source_ip_ = proxy_original_source_ip; + setParameter("Proxy_original_source_ip", proxy_original_source_ip); +} + +std::string UnassignPrivateIpAddressesRequest::getOwnerIdLoginEmail()const +{ + return ownerIdLoginEmail_; +} + +void UnassignPrivateIpAddressesRequest::setOwnerIdLoginEmail(const std::string& ownerIdLoginEmail) +{ + ownerIdLoginEmail_ = ownerIdLoginEmail; + setParameter("OwnerIdLoginEmail", ownerIdLoginEmail); +} + +std::string UnassignPrivateIpAddressesRequest::getCallerType()const +{ + return callerType_; +} + +void UnassignPrivateIpAddressesRequest::setCallerType(const std::string& callerType) +{ + callerType_ = callerType; + setParameter("CallerType", callerType); +} + +std::string UnassignPrivateIpAddressesRequest::getAccessKeyId()const +{ + return accessKeyId_; +} + +void UnassignPrivateIpAddressesRequest::setAccessKeyId(const std::string& accessKeyId) +{ + accessKeyId_ = accessKeyId; + setParameter("AccessKeyId", accessKeyId); +} + +std::string UnassignPrivateIpAddressesRequest::getResourceGroupId()const +{ + return resourceGroupId_; +} + +void UnassignPrivateIpAddressesRequest::setResourceGroupId(const std::string& resourceGroupId) +{ + resourceGroupId_ = resourceGroupId; + setParameter("ResourceGroupId", resourceGroupId); +} + +std::string UnassignPrivateIpAddressesRequest::getSecurityToken()const +{ + return securityToken_; +} + +void UnassignPrivateIpAddressesRequest::setSecurityToken(const std::string& securityToken) +{ + securityToken_ = securityToken; + setParameter("SecurityToken", securityToken); +} + +std::string UnassignPrivateIpAddressesRequest::getRegionId()const +{ + return regionId_; +} + +void UnassignPrivateIpAddressesRequest::setRegionId(const std::string& regionId) +{ + regionId_ = regionId; + setParameter("RegionId", regionId); +} + +bool UnassignPrivateIpAddressesRequest::getEnable()const +{ + return enable_; +} + +void UnassignPrivateIpAddressesRequest::setEnable(bool enable) +{ + enable_ = enable; + setParameter("Enable", std::to_string(enable)); +} + +std::string UnassignPrivateIpAddressesRequest::getRequestContent()const +{ + return requestContent_; +} + +void UnassignPrivateIpAddressesRequest::setRequestContent(const std::string& requestContent) +{ + requestContent_ = requestContent; + setParameter("RequestContent", requestContent); +} + +std::string UnassignPrivateIpAddressesRequest::getCallerBidEmail()const +{ + return callerBidEmail_; +} + +void UnassignPrivateIpAddressesRequest::setCallerBidEmail(const std::string& callerBidEmail) +{ + callerBidEmail_ = callerBidEmail; + setParameter("CallerBidEmail", callerBidEmail); +} + +std::string UnassignPrivateIpAddressesRequest::getCallerUidEmail()const +{ + return callerUidEmail_; +} + +void UnassignPrivateIpAddressesRequest::setCallerUidEmail(const std::string& callerUidEmail) +{ + callerUidEmail_ = callerUidEmail; + setParameter("CallerUidEmail", callerUidEmail); +} + +long UnassignPrivateIpAddressesRequest::getCallerUid()const +{ + return callerUid_; +} + +void UnassignPrivateIpAddressesRequest::setCallerUid(long callerUid) +{ + callerUid_ = callerUid; + setParameter("CallerUid", std::to_string(callerUid)); +} + +std::string UnassignPrivateIpAddressesRequest::getApp_ip()const +{ + return app_ip_; +} + +void UnassignPrivateIpAddressesRequest::setApp_ip(const std::string& app_ip) +{ + app_ip_ = app_ip; + setParameter("App_ip", app_ip); +} + +std::string UnassignPrivateIpAddressesRequest::getResourceOwnerAccount()const +{ + return resourceOwnerAccount_; +} + +void UnassignPrivateIpAddressesRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount) +{ + resourceOwnerAccount_ = resourceOwnerAccount; + setParameter("ResourceOwnerAccount", resourceOwnerAccount); +} + +std::string UnassignPrivateIpAddressesRequest::getOwnerAccount()const +{ + return ownerAccount_; +} + +void UnassignPrivateIpAddressesRequest::setOwnerAccount(const std::string& ownerAccount) +{ + ownerAccount_ = ownerAccount; + setParameter("OwnerAccount", ownerAccount); +} + +std::string UnassignPrivateIpAddressesRequest::getCallerBid()const +{ + return callerBid_; +} + +void UnassignPrivateIpAddressesRequest::setCallerBid(const std::string& callerBid) +{ + callerBid_ = callerBid; + setParameter("CallerBid", callerBid); +} + +long UnassignPrivateIpAddressesRequest::getOwnerId()const +{ + return ownerId_; +} + +void UnassignPrivateIpAddressesRequest::setOwnerId(long ownerId) +{ + ownerId_ = ownerId; + setParameter("OwnerId", std::to_string(ownerId)); +} + +bool UnassignPrivateIpAddressesRequest::getProxy_trust_transport_info()const +{ + return proxy_trust_transport_info_; +} + +void UnassignPrivateIpAddressesRequest::setProxy_trust_transport_info(bool proxy_trust_transport_info) +{ + proxy_trust_transport_info_ = proxy_trust_transport_info; + setParameter("Proxy_trust_transport_info", std::to_string(proxy_trust_transport_info)); +} + +bool UnassignPrivateIpAddressesRequest::getAk_mfa_present()const +{ + return ak_mfa_present_; +} + +void UnassignPrivateIpAddressesRequest::setAk_mfa_present(bool ak_mfa_present) +{ + ak_mfa_present_ = ak_mfa_present; + setParameter("Ak_mfa_present", std::to_string(ak_mfa_present)); +} + +bool UnassignPrivateIpAddressesRequest::getSecurity_transport()const +{ + return security_transport_; +} + +void UnassignPrivateIpAddressesRequest::setSecurity_transport(bool security_transport) +{ + security_transport_ = security_transport; + setParameter("Security_transport", std::to_string(security_transport)); +} + +std::vector UnassignPrivateIpAddressesRequest::getPrivateIpAddress()const +{ + return privateIpAddress_; +} + +void UnassignPrivateIpAddressesRequest::setPrivateIpAddress(const std::vector& privateIpAddress) +{ + privateIpAddress_ = privateIpAddress; + for(int i = 0; i!= privateIpAddress.size(); i++) + setParameter("PrivateIpAddress."+ std::to_string(i), privateIpAddress.at(i)); +} + +std::string UnassignPrivateIpAddressesRequest::getRequestId()const +{ + return requestId_; +} + +void UnassignPrivateIpAddressesRequest::setRequestId(const std::string& requestId) +{ + requestId_ = requestId; + setParameter("RequestId", requestId); +} + +std::string UnassignPrivateIpAddressesRequest::getNetworkInterfaceId()const +{ + return networkInterfaceId_; +} + +void UnassignPrivateIpAddressesRequest::setNetworkInterfaceId(const std::string& networkInterfaceId) +{ + networkInterfaceId_ = networkInterfaceId; + setParameter("NetworkInterfaceId", networkInterfaceId); +} + diff --git a/ecs/src/model/UnassignPrivateIpAddressesResult.cc b/ecs/src/model/UnassignPrivateIpAddressesResult.cc new file mode 100644 index 000000000..fd0f2206c --- /dev/null +++ b/ecs/src/model/UnassignPrivateIpAddressesResult.cc @@ -0,0 +1,45 @@ +/* + * 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; + +UnassignPrivateIpAddressesResult::UnassignPrivateIpAddressesResult() : + ServiceResult() +{} + +UnassignPrivateIpAddressesResult::UnassignPrivateIpAddressesResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +UnassignPrivateIpAddressesResult::~UnassignPrivateIpAddressesResult() +{} + +void UnassignPrivateIpAddressesResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + + setRequestId(value["RequestId"].asString()); + +} +