Prechádzať zdrojové kódy

Update DescribeApiMetering API.

sdk-team 2 rokov pred
rodič
commit
7d74c183f6

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1960
+1.36.1961

+ 1 - 0
market/include/alibabacloud/market/model/DescribeApiMeteringResult.h

@@ -39,6 +39,7 @@ namespace AlibabaCloud
 					std::string productCode;
 					long totalQuota;
 					long totalUsage;
+					long totalCapacity;
 					std::string unit;
 				};
 

+ 4 - 0
market/include/alibabacloud/market/model/DescribeInstanceResult.h

@@ -67,7 +67,9 @@ namespace AlibabaCloud
 				explicit DescribeInstanceResult(const std::string &payload);
 				~DescribeInstanceResult();
 				std::string getStatus()const;
+				std::string getLicenseCode()const;
 				std::string getProductName()const;
+				std::string getActiveAddress()const;
 				long getInstanceId()const;
 				long getEndOn()const;
 				std::string getProductCode()const;
@@ -91,7 +93,9 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 			private:
 				std::string status_;
+				std::string licenseCode_;
 				std::string productName_;
+				std::string activeAddress_;
 				long instanceId_;
 				long endOn_;
 				std::string productCode_;

+ 3 - 3
market/include/alibabacloud/market/model/FinishCurrentProjectNodeRequest.h

@@ -32,17 +32,17 @@ public:
 	~FinishCurrentProjectNodeRequest();
 	std::string getTemplateForm() const;
 	void setTemplateForm(const std::string &templateForm);
-	std::string getInstanceId() const;
-	void setInstanceId(const std::string &instanceId);
 	std::string getRemark() const;
 	void setRemark(const std::string &remark);
+	std::string getInstanceId() const;
+	void setInstanceId(const std::string &instanceId);
 	long getNodeId() const;
 	void setNodeId(long nodeId);
 
 private:
 	std::string templateForm_;
-	std::string instanceId_;
 	std::string remark_;
+	std::string instanceId_;
 	long nodeId_;
 };
 } // namespace Model

+ 3 - 3
market/include/alibabacloud/market/model/PauseProjectRequest.h

@@ -30,16 +30,16 @@ class ALIBABACLOUD_MARKET_EXPORT PauseProjectRequest : public RpcServiceRequest
 public:
 	PauseProjectRequest();
 	~PauseProjectRequest();
-	std::string getInstanceId() const;
-	void setInstanceId(const std::string &instanceId);
 	std::string getRemark() const;
 	void setRemark(const std::string &remark);
+	std::string getInstanceId() const;
+	void setInstanceId(const std::string &instanceId);
 	long getNodeId() const;
 	void setNodeId(long nodeId);
 
 private:
-	std::string instanceId_;
 	std::string remark_;
+	std::string instanceId_;
 	long nodeId_;
 };
 } // namespace Model

+ 3 - 3
market/include/alibabacloud/market/model/ResumeProjectRequest.h

@@ -30,16 +30,16 @@ class ALIBABACLOUD_MARKET_EXPORT ResumeProjectRequest : public RpcServiceRequest
 public:
 	ResumeProjectRequest();
 	~ResumeProjectRequest();
-	std::string getInstanceId() const;
-	void setInstanceId(const std::string &instanceId);
 	std::string getRemark() const;
 	void setRemark(const std::string &remark);
+	std::string getInstanceId() const;
+	void setInstanceId(const std::string &instanceId);
 	long getNodeId() const;
 	void setNodeId(long nodeId);
 
 private:
-	std::string instanceId_;
 	std::string remark_;
+	std::string instanceId_;
 	long nodeId_;
 };
 } // namespace Model

+ 3 - 3
market/include/alibabacloud/market/model/RollbackCurrentProjectNodeRequest.h

@@ -30,16 +30,16 @@ class ALIBABACLOUD_MARKET_EXPORT RollbackCurrentProjectNodeRequest : public RpcS
 public:
 	RollbackCurrentProjectNodeRequest();
 	~RollbackCurrentProjectNodeRequest();
-	std::string getInstanceId() const;
-	void setInstanceId(const std::string &instanceId);
 	std::string getRemark() const;
 	void setRemark(const std::string &remark);
+	std::string getInstanceId() const;
+	void setInstanceId(const std::string &instanceId);
 	long getNodeId() const;
 	void setNodeId(long nodeId);
 
 private:
-	std::string instanceId_;
 	std::string remark_;
+	std::string instanceId_;
 	long nodeId_;
 };
 } // namespace Model

+ 3 - 3
market/src/MarketClient.cc

@@ -31,21 +31,21 @@ MarketClient::MarketClient(const Credentials &credentials, const ClientConfigura
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "yunmarket");
 }
 
 MarketClient::MarketClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "yunmarket");
 }
 
 MarketClient::MarketClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "yunmarket");
 }
 
 MarketClient::~MarketClient()

+ 2 - 0
market/src/model/DescribeApiMeteringResult.cc

@@ -53,6 +53,8 @@ void DescribeApiMeteringResult::parse(const std::string &payload)
 			resultObject.totalQuota = std::stol(valueResultresultItem["TotalQuota"].asString());
 		if(!valueResultresultItem["TotalUsage"].isNull())
 			resultObject.totalUsage = std::stol(valueResultresultItem["TotalUsage"].asString());
+		if(!valueResultresultItem["TotalCapacity"].isNull())
+			resultObject.totalCapacity = std::stol(valueResultresultItem["TotalCapacity"].asString());
 		if(!valueResultresultItem["Unit"].isNull())
 			resultObject.unit = valueResultresultItem["Unit"].asString();
 		result_.push_back(resultObject);

+ 14 - 0
market/src/model/DescribeInstanceResult.cc

@@ -124,6 +124,10 @@ void DescribeInstanceResult::parse(const std::string &payload)
 		supplierName_ = value["SupplierName"].asString();
 	if(!value["AutoRenewal"].isNull())
 		autoRenewal_ = value["AutoRenewal"].asString();
+	if(!value["ActiveAddress"].isNull())
+		activeAddress_ = value["ActiveAddress"].asString();
+	if(!value["LicenseCode"].isNull())
+		licenseCode_ = value["LicenseCode"].asString();
 
 }
 
@@ -132,11 +136,21 @@ std::string DescribeInstanceResult::getStatus()const
 	return status_;
 }
 
+std::string DescribeInstanceResult::getLicenseCode()const
+{
+	return licenseCode_;
+}
+
 std::string DescribeInstanceResult::getProductName()const
 {
 	return productName_;
 }
 
+std::string DescribeInstanceResult::getActiveAddress()const
+{
+	return activeAddress_;
+}
+
 long DescribeInstanceResult::getInstanceId()const
 {
 	return instanceId_;

+ 9 - 9
market/src/model/FinishCurrentProjectNodeRequest.cc

@@ -34,15 +34,6 @@ void FinishCurrentProjectNodeRequest::setTemplateForm(const std::string &templat
   setParameter(std::string("TemplateForm"), templateForm);
 }
 
-std::string FinishCurrentProjectNodeRequest::getInstanceId() const {
-  return instanceId_;
-}
-
-void FinishCurrentProjectNodeRequest::setInstanceId(const std::string &instanceId) {
-  instanceId_ = instanceId;
-  setParameter(std::string("InstanceId"), instanceId);
-}
-
 std::string FinishCurrentProjectNodeRequest::getRemark() const {
   return remark_;
 }
@@ -52,6 +43,15 @@ void FinishCurrentProjectNodeRequest::setRemark(const std::string &remark) {
   setParameter(std::string("Remark"), remark);
 }
 
+std::string FinishCurrentProjectNodeRequest::getInstanceId() const {
+  return instanceId_;
+}
+
+void FinishCurrentProjectNodeRequest::setInstanceId(const std::string &instanceId) {
+  instanceId_ = instanceId;
+  setParameter(std::string("InstanceId"), instanceId);
+}
+
 long FinishCurrentProjectNodeRequest::getNodeId() const {
   return nodeId_;
 }

+ 9 - 9
market/src/model/PauseProjectRequest.cc

@@ -25,15 +25,6 @@ PauseProjectRequest::PauseProjectRequest()
 
 PauseProjectRequest::~PauseProjectRequest() {}
 
-std::string PauseProjectRequest::getInstanceId() const {
-  return instanceId_;
-}
-
-void PauseProjectRequest::setInstanceId(const std::string &instanceId) {
-  instanceId_ = instanceId;
-  setParameter(std::string("InstanceId"), instanceId);
-}
-
 std::string PauseProjectRequest::getRemark() const {
   return remark_;
 }
@@ -43,6 +34,15 @@ void PauseProjectRequest::setRemark(const std::string &remark) {
   setParameter(std::string("Remark"), remark);
 }
 
+std::string PauseProjectRequest::getInstanceId() const {
+  return instanceId_;
+}
+
+void PauseProjectRequest::setInstanceId(const std::string &instanceId) {
+  instanceId_ = instanceId;
+  setParameter(std::string("InstanceId"), instanceId);
+}
+
 long PauseProjectRequest::getNodeId() const {
   return nodeId_;
 }

+ 9 - 9
market/src/model/ResumeProjectRequest.cc

@@ -25,15 +25,6 @@ ResumeProjectRequest::ResumeProjectRequest()
 
 ResumeProjectRequest::~ResumeProjectRequest() {}
 
-std::string ResumeProjectRequest::getInstanceId() const {
-  return instanceId_;
-}
-
-void ResumeProjectRequest::setInstanceId(const std::string &instanceId) {
-  instanceId_ = instanceId;
-  setParameter(std::string("InstanceId"), instanceId);
-}
-
 std::string ResumeProjectRequest::getRemark() const {
   return remark_;
 }
@@ -43,6 +34,15 @@ void ResumeProjectRequest::setRemark(const std::string &remark) {
   setParameter(std::string("Remark"), remark);
 }
 
+std::string ResumeProjectRequest::getInstanceId() const {
+  return instanceId_;
+}
+
+void ResumeProjectRequest::setInstanceId(const std::string &instanceId) {
+  instanceId_ = instanceId;
+  setParameter(std::string("InstanceId"), instanceId);
+}
+
 long ResumeProjectRequest::getNodeId() const {
   return nodeId_;
 }

+ 9 - 9
market/src/model/RollbackCurrentProjectNodeRequest.cc

@@ -25,15 +25,6 @@ RollbackCurrentProjectNodeRequest::RollbackCurrentProjectNodeRequest()
 
 RollbackCurrentProjectNodeRequest::~RollbackCurrentProjectNodeRequest() {}
 
-std::string RollbackCurrentProjectNodeRequest::getInstanceId() const {
-  return instanceId_;
-}
-
-void RollbackCurrentProjectNodeRequest::setInstanceId(const std::string &instanceId) {
-  instanceId_ = instanceId;
-  setParameter(std::string("InstanceId"), instanceId);
-}
-
 std::string RollbackCurrentProjectNodeRequest::getRemark() const {
   return remark_;
 }
@@ -43,6 +34,15 @@ void RollbackCurrentProjectNodeRequest::setRemark(const std::string &remark) {
   setParameter(std::string("Remark"), remark);
 }
 
+std::string RollbackCurrentProjectNodeRequest::getInstanceId() const {
+  return instanceId_;
+}
+
+void RollbackCurrentProjectNodeRequest::setInstanceId(const std::string &instanceId) {
+  instanceId_ = instanceId;
+  setParameter(std::string("InstanceId"), instanceId);
+}
+
 long RollbackCurrentProjectNodeRequest::getNodeId() const {
   return nodeId_;
 }