Support FilterKey for RestoreInstance.

CHANGELOG

@@ -1,3 +1,8 @@
+2021-07-07 Version: 1.36.809
+- Support FilterKey for RestoreInstance.
+- DescribeInstanceAttribute add return argument BackupLogStartTime.
+- Add RemoveSubInstance for Global Distributed Cache.
+
 2021-07-07 Version: 1.36.808
 - Supported AAA for BBB.
 

VERSION

@@ -1 +1 @@
-1.36.808
+1.36.809

r-kvstore/CMakeLists.txt

@@ -185,6 +185,8 @@ set(r-kvstore_public_header_model
 	include/alibabacloud/r-kvstore/model/ReleaseDirectConnectionResult.h
 	include/alibabacloud/r-kvstore/model/ReleaseInstancePublicConnectionRequest.h
 	include/alibabacloud/r-kvstore/model/ReleaseInstancePublicConnectionResult.h
+	include/alibabacloud/r-kvstore/model/RemoveSubInstanceRequest.h
+	include/alibabacloud/r-kvstore/model/RemoveSubInstanceResult.h
 	include/alibabacloud/r-kvstore/model/RenewAdditionalBandwidthRequest.h
 	include/alibabacloud/r-kvstore/model/RenewAdditionalBandwidthResult.h
 	include/alibabacloud/r-kvstore/model/RenewInstanceRequest.h
@@ -199,6 +201,8 @@ set(r-kvstore_public_header_model
 	include/alibabacloud/r-kvstore/model/RestoreInstanceResult.h
 	include/alibabacloud/r-kvstore/model/SwitchInstanceHARequest.h
 	include/alibabacloud/r-kvstore/model/SwitchInstanceHAResult.h
+	include/alibabacloud/r-kvstore/model/SwitchInstanceProxyRequest.h
+	include/alibabacloud/r-kvstore/model/SwitchInstanceProxyResult.h
 	include/alibabacloud/r-kvstore/model/SwitchNetworkRequest.h
 	include/alibabacloud/r-kvstore/model/SwitchNetworkResult.h
 	include/alibabacloud/r-kvstore/model/SyncDtsStatusRequest.h
@@ -378,6 +382,8 @@ set(r-kvstore_src
 	src/model/ReleaseDirectConnectionResult.cc
 	src/model/ReleaseInstancePublicConnectionRequest.cc
 	src/model/ReleaseInstancePublicConnectionResult.cc
+	src/model/RemoveSubInstanceRequest.cc
+	src/model/RemoveSubInstanceResult.cc
 	src/model/RenewAdditionalBandwidthRequest.cc
 	src/model/RenewAdditionalBandwidthResult.cc
 	src/model/RenewInstanceRequest.cc
@@ -392,6 +398,8 @@ set(r-kvstore_src
 	src/model/RestoreInstanceResult.cc
 	src/model/SwitchInstanceHARequest.cc
 	src/model/SwitchInstanceHAResult.cc
+	src/model/SwitchInstanceProxyRequest.cc
+	src/model/SwitchInstanceProxyResult.cc
 	src/model/SwitchNetworkRequest.cc
 	src/model/SwitchNetworkResult.cc
 	src/model/SyncDtsStatusRequest.cc

r-kvstore/include/alibabacloud/r-kvstore/R_kvstoreClient.h

@@ -186,6 +186,8 @@
 #include "model/ReleaseDirectConnectionResult.h"
 #include "model/ReleaseInstancePublicConnectionRequest.h"
 #include "model/ReleaseInstancePublicConnectionResult.h"
+#include "model/RemoveSubInstanceRequest.h"
+#include "model/RemoveSubInstanceResult.h"
 #include "model/RenewAdditionalBandwidthRequest.h"
 #include "model/RenewAdditionalBandwidthResult.h"
 #include "model/RenewInstanceRequest.h"
@@ -200,6 +202,8 @@
 #include "model/RestoreInstanceResult.h"
 #include "model/SwitchInstanceHARequest.h"
 #include "model/SwitchInstanceHAResult.h"
+#include "model/SwitchInstanceProxyRequest.h"
+#include "model/SwitchInstanceProxyResult.h"
 #include "model/SwitchNetworkRequest.h"
 #include "model/SwitchNetworkResult.h"
 #include "model/SyncDtsStatusRequest.h"
@@ -467,6 +471,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ReleaseInstancePublicConnectionResult> ReleaseInstancePublicConnectionOutcome;
 			typedef std::future<ReleaseInstancePublicConnectionOutcome> ReleaseInstancePublicConnectionOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::ReleaseInstancePublicConnectionRequest&, const ReleaseInstancePublicConnectionOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ReleaseInstancePublicConnectionAsyncHandler;
+			typedef Outcome<Error, Model::RemoveSubInstanceResult> RemoveSubInstanceOutcome;
+			typedef std::future<RemoveSubInstanceOutcome> RemoveSubInstanceOutcomeCallable;
+			typedef std::function<void(const R_kvstoreClient*, const Model::RemoveSubInstanceRequest&, const RemoveSubInstanceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RemoveSubInstanceAsyncHandler;
 			typedef Outcome<Error, Model::RenewAdditionalBandwidthResult> RenewAdditionalBandwidthOutcome;
 			typedef std::future<RenewAdditionalBandwidthOutcome> RenewAdditionalBandwidthOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::RenewAdditionalBandwidthRequest&, const RenewAdditionalBandwidthOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> RenewAdditionalBandwidthAsyncHandler;
@@ -488,6 +495,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::SwitchInstanceHAResult> SwitchInstanceHAOutcome;
 			typedef std::future<SwitchInstanceHAOutcome> SwitchInstanceHAOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::SwitchInstanceHARequest&, const SwitchInstanceHAOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SwitchInstanceHAAsyncHandler;
+			typedef Outcome<Error, Model::SwitchInstanceProxyResult> SwitchInstanceProxyOutcome;
+			typedef std::future<SwitchInstanceProxyOutcome> SwitchInstanceProxyOutcomeCallable;
+			typedef std::function<void(const R_kvstoreClient*, const Model::SwitchInstanceProxyRequest&, const SwitchInstanceProxyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SwitchInstanceProxyAsyncHandler;
 			typedef Outcome<Error, Model::SwitchNetworkResult> SwitchNetworkOutcome;
 			typedef std::future<SwitchNetworkOutcome> SwitchNetworkOutcomeCallable;
 			typedef std::function<void(const R_kvstoreClient*, const Model::SwitchNetworkRequest&, const SwitchNetworkOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> SwitchNetworkAsyncHandler;
@@ -757,6 +767,9 @@ namespace AlibabaCloud
 			ReleaseInstancePublicConnectionOutcome releaseInstancePublicConnection(const Model::ReleaseInstancePublicConnectionRequest &request)const;
 			void releaseInstancePublicConnectionAsync(const Model::ReleaseInstancePublicConnectionRequest& request, const ReleaseInstancePublicConnectionAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ReleaseInstancePublicConnectionOutcomeCallable releaseInstancePublicConnectionCallable(const Model::ReleaseInstancePublicConnectionRequest& request) const;
+			RemoveSubInstanceOutcome removeSubInstance(const Model::RemoveSubInstanceRequest &request)const;
+			void removeSubInstanceAsync(const Model::RemoveSubInstanceRequest& request, const RemoveSubInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			RemoveSubInstanceOutcomeCallable removeSubInstanceCallable(const Model::RemoveSubInstanceRequest& request) const;
 			RenewAdditionalBandwidthOutcome renewAdditionalBandwidth(const Model::RenewAdditionalBandwidthRequest &request)const;
 			void renewAdditionalBandwidthAsync(const Model::RenewAdditionalBandwidthRequest& request, const RenewAdditionalBandwidthAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			RenewAdditionalBandwidthOutcomeCallable renewAdditionalBandwidthCallable(const Model::RenewAdditionalBandwidthRequest& request) const;
@@ -778,6 +791,9 @@ namespace AlibabaCloud
 			SwitchInstanceHAOutcome switchInstanceHA(const Model::SwitchInstanceHARequest &request)const;
 			void switchInstanceHAAsync(const Model::SwitchInstanceHARequest& request, const SwitchInstanceHAAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SwitchInstanceHAOutcomeCallable switchInstanceHACallable(const Model::SwitchInstanceHARequest& request) const;
+			SwitchInstanceProxyOutcome switchInstanceProxy(const Model::SwitchInstanceProxyRequest &request)const;
+			void switchInstanceProxyAsync(const Model::SwitchInstanceProxyRequest& request, const SwitchInstanceProxyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			SwitchInstanceProxyOutcomeCallable switchInstanceProxyCallable(const Model::SwitchInstanceProxyRequest& request) const;
 			SwitchNetworkOutcome switchNetwork(const Model::SwitchNetworkRequest &request)const;
 			void switchNetworkAsync(const Model::SwitchNetworkRequest& request, const SwitchNetworkAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			SwitchNetworkOutcomeCallable switchNetworkCallable(const Model::SwitchNetworkRequest& request) const;

r-kvstore/include/alibabacloud/r-kvstore/model/CreateTairInstanceRequest.h

@@ -37,6 +37,8 @@ namespace AlibabaCloud
 
 				long getResourceOwnerId()const;
 				void setResourceOwnerId(long resourceOwnerId);
+				std::string getSecondaryZoneId()const;
+				void setSecondaryZoneId(const std::string& secondaryZoneId);
 				std::string getCouponNo()const;
 				void setCouponNo(const std::string& couponNo);
 				std::string getEngineVersion()const;
@@ -102,6 +104,7 @@ namespace AlibabaCloud
 
             private:
 				long resourceOwnerId_;
+				std::string secondaryZoneId_;
 				std::string couponNo_;
 				std::string engineVersion_;
 				std::string storageType_;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeBackupTasksResult.h

@@ -37,6 +37,7 @@ namespace AlibabaCloud
 					std::string jobMode;
 					std::string taskAction;
 					std::string startTime;
+					std::string nodeId;
 					std::string backupProgressStatus;
 					std::string process;
 					int backupJobID;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListRequest.h

@@ -67,6 +67,8 @@ namespace AlibabaCloud
 				void setOwnerId(long ownerId);
 				std::string getInstanceId()const;
 				void setInstanceId(const std::string& instanceId);
+				std::string getRegion()const;
+				void setRegion(const std::string& region);
 
             private:
 				long resourceOwnerId_;
@@ -85,6 +87,7 @@ namespace AlibabaCloud
 				std::string clusterId_;
 				long ownerId_;
 				std::string instanceId_;
+				std::string region_;
 
 			};
 		}

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeDedicatedClusterInstanceListResult.h

@@ -52,7 +52,7 @@ namespace AlibabaCloud
 					std::string instanceId;
 					std::string createTime;
 					std::string instanceClass;
-					int characterType;
+					std::string characterType;
 					std::string vswitchId;
 					int shardCount;
 					long currentBandWidth;
@@ -64,6 +64,7 @@ namespace AlibabaCloud
 					std::string instanceStatus;
 					std::vector<InstancesItem::InstanceNodes> instanceNodeList;
 					std::string customId;
+					int proxyCount;
 					std::string clusterName;
 					std::string regionId;
 					std::string maintainStartTime;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeInstanceAttributeResult.h

@@ -77,6 +77,7 @@ namespace AlibabaCloud
 					std::string replicationMode;
 					std::string replicaId;
 					std::string secondaryZoneId;
+					std::string backupLogStartTime;
 					std::string instanceName;
 					std::string storage;
 					std::string vpcId;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeInstancesResult.h

@@ -45,6 +45,7 @@ namespace AlibabaCloud
 					std::string config;
 					long port;
 					std::string destroyTime;
+					std::string globalInstanceId;
 					bool hasRenewChangeOrder;
 					int shardCount;
 					std::string connectionDomain;
@@ -68,6 +69,7 @@ namespace AlibabaCloud
 					std::string createTime;
 					std::string instanceClass;
 					bool isRds;
+					std::string secondaryZoneId;
 					std::string instanceName;
 					std::string vpcId;
 					std::string chargeType;

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeIntranetAttributeResult.h

@@ -39,6 +39,7 @@ namespace AlibabaCloud
 				~DescribeIntranetAttributeResult();
 				int getIntranetBandwidth()const;
 				std::string getBandwidthExpireTime()const;
+				bool getAutoRenewal()const;
 				std::string getExpireTime()const;
 
 			protected:
@@ -46,6 +47,7 @@ namespace AlibabaCloud
 			private:
 				int intranetBandwidth_;
 				std::string bandwidthExpireTime_;
+				bool autoRenewal_;
 				std::string expireTime_;
 
 			};

r-kvstore/include/alibabacloud/r-kvstore/model/DescribeParameterTemplatesRequest.h

@@ -53,6 +53,8 @@ namespace AlibabaCloud
 				void setOwnerAccount(const std::string& ownerAccount);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
 				std::string getCharacterType()const;
 				void setCharacterType(const std::string& characterType);
 
@@ -66,6 +68,7 @@ namespace AlibabaCloud
 				std::string resourceOwnerAccount_;
 				std::string ownerAccount_;
 				long ownerId_;
+				std::string instanceId_;
 				std::string characterType_;
 
 			};

r-kvstore/include/alibabacloud/r-kvstore/model/RemoveSubInstanceRequest.h

@@ -0,0 +1,69 @@
+/*
+ * 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_R_KVSTORE_MODEL_REMOVESUBINSTANCEREQUEST_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_REMOVESUBINSTANCEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT RemoveSubInstanceRequest : public RpcServiceRequest
+			{
+
+			public:
+				RemoveSubInstanceRequest();
+				~RemoveSubInstanceRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				bool getReleaseSubInstance()const;
+				void setReleaseSubInstance(bool releaseSubInstance);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+
+            private:
+				long resourceOwnerId_;
+				bool releaseSubInstance_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+				std::string instanceId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_REMOVESUBINSTANCEREQUEST_H_

r-kvstore/include/alibabacloud/r-kvstore/model/RemoveSubInstanceResult.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_R_KVSTORE_MODEL_REMOVESUBINSTANCERESULT_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_REMOVESUBINSTANCERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT RemoveSubInstanceResult : public ServiceResult
+			{
+			public:
+
+
+				RemoveSubInstanceResult();
+				explicit RemoveSubInstanceResult(const std::string &payload);
+				~RemoveSubInstanceResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_REMOVESUBINSTANCERESULT_H_

r-kvstore/include/alibabacloud/r-kvstore/model/RestoreInstanceRequest.h

@@ -39,6 +39,8 @@ namespace AlibabaCloud
 				void setResourceOwnerId(long resourceOwnerId);
 				std::string getAccessKeyId()const;
 				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getFilterKey()const;
+				void setFilterKey(const std::string& filterKey);
 				std::string getSecurityToken()const;
 				void setSecurityToken(const std::string& securityToken);
 				std::string getRestoreTime()const;
@@ -59,6 +61,7 @@ namespace AlibabaCloud
             private:
 				long resourceOwnerId_;
 				std::string accessKeyId_;
+				std::string filterKey_;
 				std::string securityToken_;
 				std::string restoreTime_;
 				std::string resourceOwnerAccount_;

r-kvstore/include/alibabacloud/r-kvstore/model/SwitchInstanceProxyRequest.h

@@ -0,0 +1,72 @@
+/*
+ * 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_R_KVSTORE_MODEL_SWITCHINSTANCEPROXYREQUEST_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_SWITCHINSTANCEPROXYREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT SwitchInstanceProxyRequest : public RpcServiceRequest
+			{
+
+			public:
+				SwitchInstanceProxyRequest();
+				~SwitchInstanceProxyRequest();
+
+				long getResourceOwnerId()const;
+				void setResourceOwnerId(long resourceOwnerId);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getSecurityToken()const;
+				void setSecurityToken(const std::string& securityToken);
+				std::string getProduct()const;
+				void setProduct(const std::string& product);
+				std::string getResourceOwnerAccount()const;
+				void setResourceOwnerAccount(const std::string& resourceOwnerAccount);
+				std::string getOwnerAccount()const;
+				void setOwnerAccount(const std::string& ownerAccount);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getInstanceId()const;
+				void setInstanceId(const std::string& instanceId);
+				std::string getCategory()const;
+				void setCategory(const std::string& category);
+
+            private:
+				long resourceOwnerId_;
+				std::string accessKeyId_;
+				std::string securityToken_;
+				std::string product_;
+				std::string resourceOwnerAccount_;
+				std::string ownerAccount_;
+				long ownerId_;
+				std::string instanceId_;
+				std::string category_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_SWITCHINSTANCEPROXYREQUEST_H_

r-kvstore/include/alibabacloud/r-kvstore/model/SwitchInstanceProxyResult.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_R_KVSTORE_MODEL_SWITCHINSTANCEPROXYRESULT_H_
+#define ALIBABACLOUD_R_KVSTORE_MODEL_SWITCHINSTANCEPROXYRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/r-kvstore/R_kvstoreExport.h>
+
+namespace AlibabaCloud
+{
+	namespace R_kvstore
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_R_KVSTORE_EXPORT SwitchInstanceProxyResult : public ServiceResult
+			{
+			public:
+
+
+				SwitchInstanceProxyResult();
+				explicit SwitchInstanceProxyResult(const std::string &payload);
+				~SwitchInstanceProxyResult();
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_R_KVSTORE_MODEL_SWITCHINSTANCEPROXYRESULT_H_

r-kvstore/src/R-kvstoreClient.cc

@@ -3003,6 +3003,42 @@ R_kvstoreClient::ReleaseInstancePublicConnectionOutcomeCallable R_kvstoreClient:
 	return task->get_future();
 }
 
+R_kvstoreClient::RemoveSubInstanceOutcome R_kvstoreClient::removeSubInstance(const RemoveSubInstanceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return RemoveSubInstanceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return RemoveSubInstanceOutcome(RemoveSubInstanceResult(outcome.result()));
+	else
+		return RemoveSubInstanceOutcome(outcome.error());
+}
+
+void R_kvstoreClient::removeSubInstanceAsync(const RemoveSubInstanceRequest& request, const RemoveSubInstanceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, removeSubInstance(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+R_kvstoreClient::RemoveSubInstanceOutcomeCallable R_kvstoreClient::removeSubInstanceCallable(const RemoveSubInstanceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<RemoveSubInstanceOutcome()>>(
+			[this, request]()
+			{
+			return this->removeSubInstance(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 R_kvstoreClient::RenewAdditionalBandwidthOutcome R_kvstoreClient::renewAdditionalBandwidth(const RenewAdditionalBandwidthRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();
@@ -3255,6 +3291,42 @@ R_kvstoreClient::SwitchInstanceHAOutcomeCallable R_kvstoreClient::switchInstance
 	return task->get_future();
 }
 
+R_kvstoreClient::SwitchInstanceProxyOutcome R_kvstoreClient::switchInstanceProxy(const SwitchInstanceProxyRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return SwitchInstanceProxyOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return SwitchInstanceProxyOutcome(SwitchInstanceProxyResult(outcome.result()));
+	else
+		return SwitchInstanceProxyOutcome(outcome.error());
+}
+
+void R_kvstoreClient::switchInstanceProxyAsync(const SwitchInstanceProxyRequest& request, const SwitchInstanceProxyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, switchInstanceProxy(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+R_kvstoreClient::SwitchInstanceProxyOutcomeCallable R_kvstoreClient::switchInstanceProxyCallable(const SwitchInstanceProxyRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<SwitchInstanceProxyOutcome()>>(
+			[this, request]()
+			{
+			return this->switchInstanceProxy(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 R_kvstoreClient::SwitchNetworkOutcome R_kvstoreClient::switchNetwork(const SwitchNetworkRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

r-kvstore/src/model/CreateTairInstanceRequest.cc

@@ -38,6 +38,17 @@ void CreateTairInstanceRequest::setResourceOwnerId(long resourceOwnerId)
 	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
 }
 
+std::string CreateTairInstanceRequest::getSecondaryZoneId()const
+{
+	return secondaryZoneId_;
+}
+
+void CreateTairInstanceRequest::setSecondaryZoneId(const std::string& secondaryZoneId)
+{
+	secondaryZoneId_ = secondaryZoneId;
+	setParameter("SecondaryZoneId", secondaryZoneId);
+}
+
 std::string CreateTairInstanceRequest::getCouponNo()const
 {
 	return couponNo_;

r-kvstore/src/model/DescribeBackupTasksResult.cc

@@ -55,6 +55,8 @@ void DescribeBackupTasksResult::parse(const std::string &payload)
 			backupJobsObject.startTime = valueBackupJobsBackupJob["StartTime"].asString();
 		if(!valueBackupJobsBackupJob["TaskAction"].isNull())
 			backupJobsObject.taskAction = valueBackupJobsBackupJob["TaskAction"].asString();
+		if(!valueBackupJobsBackupJob["NodeId"].isNull())
+			backupJobsObject.nodeId = valueBackupJobsBackupJob["NodeId"].asString();
 		backupJobs_.push_back(backupJobsObject);
 	}
 	if(!value["InstanceId"].isNull())

r-kvstore/src/model/DescribeDedicatedClusterInstanceListRequest.cc

@@ -203,3 +203,14 @@ void DescribeDedicatedClusterInstanceListRequest::setInstanceId(const std::strin
 	setParameter("InstanceId", instanceId);
 }
 
+std::string DescribeDedicatedClusterInstanceListRequest::getRegion()const
+{
+	return region_;
+}
+
+void DescribeDedicatedClusterInstanceListRequest::setRegion(const std::string& region)
+{
+	region_ = region;
+	setParameter("Region", region);
+}
+

r-kvstore/src/model/DescribeDedicatedClusterInstanceListResult.cc

@@ -44,7 +44,7 @@ void DescribeDedicatedClusterInstanceListResult::parse(const std::string &payloa
 	{
 		InstancesItem instancesObject;
 		if(!valueInstancesInstancesItem["CharacterType"].isNull())
-			instancesObject.characterType = std::stoi(valueInstancesInstancesItem["CharacterType"].asString());
+			instancesObject.characterType = valueInstancesInstancesItem["CharacterType"].asString();
 		if(!valueInstancesInstancesItem["ClusterId"].isNull())
 			instancesObject.clusterId = valueInstancesInstancesItem["ClusterId"].asString();
 		if(!valueInstancesInstancesItem["ClusterName"].isNull())
@@ -87,6 +87,8 @@ void DescribeDedicatedClusterInstanceListResult::parse(const std::string &payloa
 			instancesObject.currentBandWidth = std::stol(valueInstancesInstancesItem["CurrentBandWidth"].asString());
 		if(!valueInstancesInstancesItem["BandWidth"].isNull())
 			instancesObject.bandWidth = std::stol(valueInstancesInstancesItem["BandWidth"].asString());
+		if(!valueInstancesInstancesItem["ProxyCount"].isNull())
+			instancesObject.proxyCount = std::stoi(valueInstancesInstancesItem["ProxyCount"].asString());
 		auto allInstanceNodeListNode = valueInstancesInstancesItem["InstanceNodeList"]["InstanceNodes"];
 		for (auto valueInstancesInstancesItemInstanceNodeListInstanceNodes : allInstanceNodeListNode)
 		{

r-kvstore/src/model/DescribeInstanceAttributeResult.cc

@@ -133,6 +133,8 @@ void DescribeInstanceAttributeResult::parse(const std::string &payload)
 			instancesObject.secondaryZoneId = valueInstancesDBInstanceAttribute["SecondaryZoneId"].asString();
 		if(!valueInstancesDBInstanceAttribute["ZoneType"].isNull())
 			instancesObject.zoneType = valueInstancesDBInstanceAttribute["ZoneType"].asString();
+		if(!valueInstancesDBInstanceAttribute["BackupLogStartTime"].isNull())
+			instancesObject.backupLogStartTime = valueInstancesDBInstanceAttribute["BackupLogStartTime"].asString();
 		auto allTagsNode = valueInstancesDBInstanceAttribute["Tags"]["Tag"];
 		for (auto valueInstancesDBInstanceAttributeTagsTag : allTagsNode)
 		{

r-kvstore/src/model/DescribeInstancesResult.cc

@@ -115,6 +115,10 @@ void DescribeInstancesResult::parse(const std::string &payload)
 			instancesObject.shardCount = std::stoi(valueInstancesKVStoreInstance["ShardCount"].asString());
 		if(!valueInstancesKVStoreInstance["ProxyCount"].isNull())
 			instancesObject.proxyCount = std::stoi(valueInstancesKVStoreInstance["ProxyCount"].asString());
+		if(!valueInstancesKVStoreInstance["SecondaryZoneId"].isNull())
+			instancesObject.secondaryZoneId = valueInstancesKVStoreInstance["SecondaryZoneId"].asString();
+		if(!valueInstancesKVStoreInstance["GlobalInstanceId"].isNull())
+			instancesObject.globalInstanceId = valueInstancesKVStoreInstance["GlobalInstanceId"].asString();
 		auto allTagsNode = valueInstancesKVStoreInstance["Tags"]["Tag"];
 		for (auto valueInstancesKVStoreInstanceTagsTag : allTagsNode)
 		{

r-kvstore/src/model/DescribeIntranetAttributeResult.cc

@@ -45,6 +45,8 @@ void DescribeIntranetAttributeResult::parse(const std::string &payload)
 		expireTime_ = value["ExpireTime"].asString();
 	if(!value["BandwidthExpireTime"].isNull())
 		bandwidthExpireTime_ = value["BandwidthExpireTime"].asString();
+	if(!value["AutoRenewal"].isNull())
+		autoRenewal_ = value["AutoRenewal"].asString() == "true";
 
 }
 
@@ -58,6 +60,11 @@ std::string DescribeIntranetAttributeResult::getBandwidthExpireTime()const
 	return bandwidthExpireTime_;
 }
 
+bool DescribeIntranetAttributeResult::getAutoRenewal()const
+{
+	return autoRenewal_;
+}
+
 std::string DescribeIntranetAttributeResult::getExpireTime()const
 {
 	return expireTime_;

r-kvstore/src/model/DescribeParameterTemplatesRequest.cc

@@ -126,6 +126,17 @@ void DescribeParameterTemplatesRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+std::string DescribeParameterTemplatesRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void DescribeParameterTemplatesRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
 std::string DescribeParameterTemplatesRequest::getCharacterType()const
 {
 	return characterType_;

r-kvstore/src/model/RemoveSubInstanceRequest.cc

@@ -0,0 +1,117 @@
+/*
+ * 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 <alibabacloud/r-kvstore/model/RemoveSubInstanceRequest.h>
+
+using AlibabaCloud::R_kvstore::Model::RemoveSubInstanceRequest;
+
+RemoveSubInstanceRequest::RemoveSubInstanceRequest() :
+	RpcServiceRequest("r-kvstore", "2015-01-01", "RemoveSubInstance")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+RemoveSubInstanceRequest::~RemoveSubInstanceRequest()
+{}
+
+long RemoveSubInstanceRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void RemoveSubInstanceRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+bool RemoveSubInstanceRequest::getReleaseSubInstance()const
+{
+	return releaseSubInstance_;
+}
+
+void RemoveSubInstanceRequest::setReleaseSubInstance(bool releaseSubInstance)
+{
+	releaseSubInstance_ = releaseSubInstance;
+	setParameter("ReleaseSubInstance", releaseSubInstance ? "true" : "false");
+}
+
+std::string RemoveSubInstanceRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void RemoveSubInstanceRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string RemoveSubInstanceRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void RemoveSubInstanceRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string RemoveSubInstanceRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void RemoveSubInstanceRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string RemoveSubInstanceRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void RemoveSubInstanceRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long RemoveSubInstanceRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void RemoveSubInstanceRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string RemoveSubInstanceRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void RemoveSubInstanceRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+

r-kvstore/src/model/RemoveSubInstanceResult.cc

@@ -0,0 +1,44 @@
+/*
+ * 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 <alibabacloud/r-kvstore/model/RemoveSubInstanceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::R_kvstore;
+using namespace AlibabaCloud::R_kvstore::Model;
+
+RemoveSubInstanceResult::RemoveSubInstanceResult() :
+	ServiceResult()
+{}
+
+RemoveSubInstanceResult::RemoveSubInstanceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+RemoveSubInstanceResult::~RemoveSubInstanceResult()
+{}
+
+void RemoveSubInstanceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+

r-kvstore/src/model/RestoreInstanceRequest.cc

@@ -49,6 +49,17 @@ void RestoreInstanceRequest::setAccessKeyId(const std::string& accessKeyId)
 	setParameter("AccessKeyId", accessKeyId);
 }
 
+std::string RestoreInstanceRequest::getFilterKey()const
+{
+	return filterKey_;
+}
+
+void RestoreInstanceRequest::setFilterKey(const std::string& filterKey)
+{
+	filterKey_ = filterKey;
+	setParameter("FilterKey", filterKey);
+}
+
 std::string RestoreInstanceRequest::getSecurityToken()const
 {
 	return securityToken_;

r-kvstore/src/model/SwitchInstanceProxyRequest.cc

@@ -0,0 +1,128 @@
+/*
+ * 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 <alibabacloud/r-kvstore/model/SwitchInstanceProxyRequest.h>
+
+using AlibabaCloud::R_kvstore::Model::SwitchInstanceProxyRequest;
+
+SwitchInstanceProxyRequest::SwitchInstanceProxyRequest() :
+	RpcServiceRequest("r-kvstore", "2015-01-01", "SwitchInstanceProxy")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+SwitchInstanceProxyRequest::~SwitchInstanceProxyRequest()
+{}
+
+long SwitchInstanceProxyRequest::getResourceOwnerId()const
+{
+	return resourceOwnerId_;
+}
+
+void SwitchInstanceProxyRequest::setResourceOwnerId(long resourceOwnerId)
+{
+	resourceOwnerId_ = resourceOwnerId;
+	setParameter("ResourceOwnerId", std::to_string(resourceOwnerId));
+}
+
+std::string SwitchInstanceProxyRequest::getAccessKeyId()const
+{
+	return accessKeyId_;
+}
+
+void SwitchInstanceProxyRequest::setAccessKeyId(const std::string& accessKeyId)
+{
+	accessKeyId_ = accessKeyId;
+	setParameter("AccessKeyId", accessKeyId);
+}
+
+std::string SwitchInstanceProxyRequest::getSecurityToken()const
+{
+	return securityToken_;
+}
+
+void SwitchInstanceProxyRequest::setSecurityToken(const std::string& securityToken)
+{
+	securityToken_ = securityToken;
+	setParameter("SecurityToken", securityToken);
+}
+
+std::string SwitchInstanceProxyRequest::getProduct()const
+{
+	return product_;
+}
+
+void SwitchInstanceProxyRequest::setProduct(const std::string& product)
+{
+	product_ = product;
+	setParameter("Product", product);
+}
+
+std::string SwitchInstanceProxyRequest::getResourceOwnerAccount()const
+{
+	return resourceOwnerAccount_;
+}
+
+void SwitchInstanceProxyRequest::setResourceOwnerAccount(const std::string& resourceOwnerAccount)
+{
+	resourceOwnerAccount_ = resourceOwnerAccount;
+	setParameter("ResourceOwnerAccount", resourceOwnerAccount);
+}
+
+std::string SwitchInstanceProxyRequest::getOwnerAccount()const
+{
+	return ownerAccount_;
+}
+
+void SwitchInstanceProxyRequest::setOwnerAccount(const std::string& ownerAccount)
+{
+	ownerAccount_ = ownerAccount;
+	setParameter("OwnerAccount", ownerAccount);
+}
+
+long SwitchInstanceProxyRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void SwitchInstanceProxyRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string SwitchInstanceProxyRequest::getInstanceId()const
+{
+	return instanceId_;
+}
+
+void SwitchInstanceProxyRequest::setInstanceId(const std::string& instanceId)
+{
+	instanceId_ = instanceId;
+	setParameter("InstanceId", instanceId);
+}
+
+std::string SwitchInstanceProxyRequest::getCategory()const
+{
+	return category_;
+}
+
+void SwitchInstanceProxyRequest::setCategory(const std::string& category)
+{
+	category_ = category;
+	setParameter("Category", category);
+}
+

r-kvstore/src/model/SwitchInstanceProxyResult.cc

@@ -0,0 +1,44 @@
+/*
+ * 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 <alibabacloud/r-kvstore/model/SwitchInstanceProxyResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::R_kvstore;
+using namespace AlibabaCloud::R_kvstore::Model;
+
+SwitchInstanceProxyResult::SwitchInstanceProxyResult() :
+	ServiceResult()
+{}
+
+SwitchInstanceProxyResult::SwitchInstanceProxyResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+SwitchInstanceProxyResult::~SwitchInstanceProxyResult()
+{}
+
+void SwitchInstanceProxyResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+
+}
+