Przeglądaj źródła

Support HealthCheckMethod for HTTP and HTTPS listener.

sdk-team 5 lat temu
rodzic
commit
edbe01d364

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-07-21 Version: 1.36.821
+- Support HealthCheckMethod for HTTP and HTTPS listener.
+
 2021-07-19 Version: 1.36.820
 - CreateNetworkInterface supports to allocate Ipv6.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.820
+1.36.821

+ 3 - 0
slb/include/alibabacloud/slb/model/CreateLoadBalancerRequest.h

@@ -43,6 +43,8 @@ namespace AlibabaCloud
 				void setMasterZoneId(const std::string& masterZoneId);
 				std::string getResourceGroupId()const;
 				void setResourceGroupId(const std::string& resourceGroupId);
+				std::string getSpecType()const;
+				void setSpecType(const std::string& specType);
 				std::string getLoadBalancerName()const;
 				void setLoadBalancerName(const std::string& loadBalancerName);
 				std::string getSlaveZoneId()const;
@@ -103,6 +105,7 @@ namespace AlibabaCloud
 				std::string addressIPVersion_;
 				std::string masterZoneId_;
 				std::string resourceGroupId_;
+				std::string specType_;
 				std::string loadBalancerName_;
 				std::string slaveZoneId_;
 				std::string loadBalancerSpec_;

+ 46 - 42
slb/include/alibabacloud/slb/model/DescribeLoadBalancerAttributeResult.h

@@ -59,106 +59,110 @@ namespace AlibabaCloud
 				DescribeLoadBalancerAttributeResult();
 				explicit DescribeLoadBalancerAttributeResult(const std::string &payload);
 				~DescribeLoadBalancerAttributeResult();
-				int getRenewalDuration()const;
-				std::string getAssociatedCenStatus()const;
 				std::vector<ListenerPortAndProtocal> getListenerPortsAndProtocal()const;
 				std::string getResourceGroupId()const;
 				std::string getAddress()const;
+				std::string getSpecType()const;
+				std::vector<BackendServer> getBackendServers()const;
+				std::string getHasReservedInfo()const;
+				std::string getBusinessStatus()const;
+				std::string getLoadBalancerSpec()const;
+				std::string getModificationProtectionReason()const;
+				std::string getAssociatedCenId()const;
+				std::vector<std::string> getListenerPorts()const;
+				std::string getCloudInstanceType()const;
+				std::string getVSwitchId()const;
+				std::string getRenewalStatus()const;
+				std::vector<std::string> getLabels()const;
+				std::string getPayType()const;
+				std::string getInternetChargeType()const;
+				std::string getReservedInfoInternetChargeType()const;
+				std::string getVpcId()const;
+				std::string getDeleteProtection()const;
+				long getEndTimeStamp()const;
+				std::string getLoadBalancerStatus()const;
+				long getAutoReleaseTime()const;
+				int getRenewalDuration()const;
+				std::string getAssociatedCenStatus()const;
 				std::string getEndTime()const;
 				bool getSupportPrivateLink()const;
 				std::string getAddressIPVersion()const;
 				std::vector<ListenerPortAndProtocol> getListenerPortsAndProtocol()const;
 				std::string getLoadBalancerId()const;
-				std::vector<BackendServer> getBackendServers()const;
-				std::string getHasReservedInfo()const;
-				std::string getBusinessStatus()const;
 				std::string getReservedInfoBandwidth()const;
 				std::string getModificationProtectionStatus()const;
-				std::string getLoadBalancerSpec()const;
 				std::string getNetworkType()const;
 				int getBandwidth()const;
-				std::string getModificationProtectionReason()const;
-				std::string getAssociatedCenId()const;
-				std::vector<std::string> getListenerPorts()const;
+				bool getSpecBpsFlag()const;
 				std::string getMasterZoneId()const;
 				std::string getTunnelType()const;
 				std::string getCloudType()const;
-				std::string getCloudInstanceType()const;
-				std::string getVSwitchId()const;
 				std::string getCreateTime()const;
-				std::string getRenewalStatus()const;
 				long getCloudInstanceUid()const;
-				std::vector<std::string> getLabels()const;
 				std::string getRenewalCycUnit()const;
-				std::string getPayType()const;
 				std::string getReservedInfoActiveTime()const;
 				std::string getCloudInstanceId()const;
 				std::string getSlaveZoneId()const;
-				std::string getInternetChargeType()const;
 				std::string getRegionIdAlias()const;
-				std::string getReservedInfoInternetChargeType()const;
 				std::string getLoadBalancerName()const;
-				std::string getVpcId()const;
-				std::string getDeleteProtection()const;
-				long getEndTimeStamp()const;
 				std::string getRegionId()const;
 				std::string getReservedInfoOrderType()const;
 				std::string getAddressType()const;
-				std::string getLoadBalancerStatus()const;
 				long getCreateTimeStamp()const;
-				long getAutoReleaseTime()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
-				int renewalDuration_;
-				std::string associatedCenStatus_;
 				std::vector<ListenerPortAndProtocal> listenerPortsAndProtocal_;
 				std::string resourceGroupId_;
 				std::string address_;
+				std::string specType_;
+				std::vector<BackendServer> backendServers_;
+				std::string hasReservedInfo_;
+				std::string businessStatus_;
+				std::string loadBalancerSpec_;
+				std::string modificationProtectionReason_;
+				std::string associatedCenId_;
+				std::vector<std::string> listenerPorts_;
+				std::string cloudInstanceType_;
+				std::string vSwitchId_;
+				std::string renewalStatus_;
+				std::vector<std::string> labels_;
+				std::string payType_;
+				std::string internetChargeType_;
+				std::string reservedInfoInternetChargeType_;
+				std::string vpcId_;
+				std::string deleteProtection_;
+				long endTimeStamp_;
+				std::string loadBalancerStatus_;
+				long autoReleaseTime_;
+				int renewalDuration_;
+				std::string associatedCenStatus_;
 				std::string endTime_;
 				bool supportPrivateLink_;
 				std::string addressIPVersion_;
 				std::vector<ListenerPortAndProtocol> listenerPortsAndProtocol_;
 				std::string loadBalancerId_;
-				std::vector<BackendServer> backendServers_;
-				std::string hasReservedInfo_;
-				std::string businessStatus_;
 				std::string reservedInfoBandwidth_;
 				std::string modificationProtectionStatus_;
-				std::string loadBalancerSpec_;
 				std::string networkType_;
 				int bandwidth_;
-				std::string modificationProtectionReason_;
-				std::string associatedCenId_;
-				std::vector<std::string> listenerPorts_;
+				bool specBpsFlag_;
 				std::string masterZoneId_;
 				std::string tunnelType_;
 				std::string cloudType_;
-				std::string cloudInstanceType_;
-				std::string vSwitchId_;
 				std::string createTime_;
-				std::string renewalStatus_;
 				long cloudInstanceUid_;
-				std::vector<std::string> labels_;
 				std::string renewalCycUnit_;
-				std::string payType_;
 				std::string reservedInfoActiveTime_;
 				std::string cloudInstanceId_;
 				std::string slaveZoneId_;
-				std::string internetChargeType_;
 				std::string regionIdAlias_;
-				std::string reservedInfoInternetChargeType_;
 				std::string loadBalancerName_;
-				std::string vpcId_;
-				std::string deleteProtection_;
-				long endTimeStamp_;
 				std::string regionId_;
 				std::string reservedInfoOrderType_;
 				std::string addressType_;
-				std::string loadBalancerStatus_;
 				long createTimeStamp_;
-				long autoReleaseTime_;
 
 			};
 		}

+ 2 - 0
slb/include/alibabacloud/slb/model/DescribeLoadBalancersResult.h

@@ -41,6 +41,7 @@ namespace AlibabaCloud
 					};
 					std::string address;
 					std::string resourceGroupId;
+					std::string specType;
 					std::string addressIPVersion;
 					std::string loadBalancerId;
 					std::string businessStatus;
@@ -49,6 +50,7 @@ namespace AlibabaCloud
 					std::string networkType;
 					int bandwidth;
 					std::string modificationProtectionReason;
+					bool specBpsFlag;
 					std::vector<LoadBalancer::Tag> tags;
 					std::string masterZoneId;
 					std::string vSwitchId;

+ 11 - 0
slb/src/model/CreateLoadBalancerRequest.cc

@@ -71,6 +71,17 @@ void CreateLoadBalancerRequest::setResourceGroupId(const std::string& resourceGr
 	setParameter("ResourceGroupId", resourceGroupId);
 }
 
+std::string CreateLoadBalancerRequest::getSpecType()const
+{
+	return specType_;
+}
+
+void CreateLoadBalancerRequest::setSpecType(const std::string& specType)
+{
+	specType_ = specType;
+	setParameter("SpecType", specType);
+}
+
 std::string CreateLoadBalancerRequest::getLoadBalancerName()const
 {
 	return loadBalancerName_;

+ 108 - 94
slb/src/model/DescribeLoadBalancerAttributeResult.cc

@@ -175,19 +175,13 @@ void DescribeLoadBalancerAttributeResult::parse(const std::string &payload)
 		modificationProtectionStatus_ = value["ModificationProtectionStatus"].asString();
 	if(!value["ModificationProtectionReason"].isNull())
 		modificationProtectionReason_ = value["ModificationProtectionReason"].asString();
+	if(!value["SpecBpsFlag"].isNull())
+		specBpsFlag_ = value["SpecBpsFlag"].asString() == "true";
+	if(!value["SpecType"].isNull())
+		specType_ = value["SpecType"].asString();
 
 }
 
-int DescribeLoadBalancerAttributeResult::getRenewalDuration()const
-{
-	return renewalDuration_;
-}
-
-std::string DescribeLoadBalancerAttributeResult::getAssociatedCenStatus()const
-{
-	return associatedCenStatus_;
-}
-
 std::vector<DescribeLoadBalancerAttributeResult::ListenerPortAndProtocal> DescribeLoadBalancerAttributeResult::getListenerPortsAndProtocal()const
 {
 	return listenerPortsAndProtocal_;
@@ -203,189 +197,219 @@ std::string DescribeLoadBalancerAttributeResult::getAddress()const
 	return address_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getEndTime()const
+std::string DescribeLoadBalancerAttributeResult::getSpecType()const
 {
-	return endTime_;
+	return specType_;
 }
 
-bool DescribeLoadBalancerAttributeResult::getSupportPrivateLink()const
+std::vector<DescribeLoadBalancerAttributeResult::BackendServer> DescribeLoadBalancerAttributeResult::getBackendServers()const
 {
-	return supportPrivateLink_;
+	return backendServers_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getAddressIPVersion()const
+std::string DescribeLoadBalancerAttributeResult::getHasReservedInfo()const
 {
-	return addressIPVersion_;
+	return hasReservedInfo_;
 }
 
-std::vector<DescribeLoadBalancerAttributeResult::ListenerPortAndProtocol> DescribeLoadBalancerAttributeResult::getListenerPortsAndProtocol()const
+std::string DescribeLoadBalancerAttributeResult::getBusinessStatus()const
 {
-	return listenerPortsAndProtocol_;
+	return businessStatus_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getLoadBalancerId()const
+std::string DescribeLoadBalancerAttributeResult::getLoadBalancerSpec()const
 {
-	return loadBalancerId_;
+	return loadBalancerSpec_;
 }
 
-std::vector<DescribeLoadBalancerAttributeResult::BackendServer> DescribeLoadBalancerAttributeResult::getBackendServers()const
+std::string DescribeLoadBalancerAttributeResult::getModificationProtectionReason()const
 {
-	return backendServers_;
+	return modificationProtectionReason_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getHasReservedInfo()const
+std::string DescribeLoadBalancerAttributeResult::getAssociatedCenId()const
 {
-	return hasReservedInfo_;
+	return associatedCenId_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getBusinessStatus()const
+std::vector<std::string> DescribeLoadBalancerAttributeResult::getListenerPorts()const
 {
-	return businessStatus_;
+	return listenerPorts_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getReservedInfoBandwidth()const
+std::string DescribeLoadBalancerAttributeResult::getCloudInstanceType()const
 {
-	return reservedInfoBandwidth_;
+	return cloudInstanceType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getModificationProtectionStatus()const
+std::string DescribeLoadBalancerAttributeResult::getVSwitchId()const
 {
-	return modificationProtectionStatus_;
+	return vSwitchId_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getLoadBalancerSpec()const
+std::string DescribeLoadBalancerAttributeResult::getRenewalStatus()const
 {
-	return loadBalancerSpec_;
+	return renewalStatus_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getNetworkType()const
+std::vector<std::string> DescribeLoadBalancerAttributeResult::getLabels()const
 {
-	return networkType_;
+	return labels_;
 }
 
-int DescribeLoadBalancerAttributeResult::getBandwidth()const
+std::string DescribeLoadBalancerAttributeResult::getPayType()const
 {
-	return bandwidth_;
+	return payType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getModificationProtectionReason()const
+std::string DescribeLoadBalancerAttributeResult::getInternetChargeType()const
 {
-	return modificationProtectionReason_;
+	return internetChargeType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getAssociatedCenId()const
+std::string DescribeLoadBalancerAttributeResult::getReservedInfoInternetChargeType()const
 {
-	return associatedCenId_;
+	return reservedInfoInternetChargeType_;
 }
 
-std::vector<std::string> DescribeLoadBalancerAttributeResult::getListenerPorts()const
+std::string DescribeLoadBalancerAttributeResult::getVpcId()const
 {
-	return listenerPorts_;
+	return vpcId_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getMasterZoneId()const
+std::string DescribeLoadBalancerAttributeResult::getDeleteProtection()const
 {
-	return masterZoneId_;
+	return deleteProtection_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getTunnelType()const
+long DescribeLoadBalancerAttributeResult::getEndTimeStamp()const
 {
-	return tunnelType_;
+	return endTimeStamp_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getCloudType()const
+std::string DescribeLoadBalancerAttributeResult::getLoadBalancerStatus()const
 {
-	return cloudType_;
+	return loadBalancerStatus_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getCloudInstanceType()const
+long DescribeLoadBalancerAttributeResult::getAutoReleaseTime()const
 {
-	return cloudInstanceType_;
+	return autoReleaseTime_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getVSwitchId()const
+int DescribeLoadBalancerAttributeResult::getRenewalDuration()const
 {
-	return vSwitchId_;
+	return renewalDuration_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getCreateTime()const
+std::string DescribeLoadBalancerAttributeResult::getAssociatedCenStatus()const
 {
-	return createTime_;
+	return associatedCenStatus_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getRenewalStatus()const
+std::string DescribeLoadBalancerAttributeResult::getEndTime()const
 {
-	return renewalStatus_;
+	return endTime_;
 }
 
-long DescribeLoadBalancerAttributeResult::getCloudInstanceUid()const
+bool DescribeLoadBalancerAttributeResult::getSupportPrivateLink()const
 {
-	return cloudInstanceUid_;
+	return supportPrivateLink_;
 }
 
-std::vector<std::string> DescribeLoadBalancerAttributeResult::getLabels()const
+std::string DescribeLoadBalancerAttributeResult::getAddressIPVersion()const
 {
-	return labels_;
+	return addressIPVersion_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getRenewalCycUnit()const
+std::vector<DescribeLoadBalancerAttributeResult::ListenerPortAndProtocol> DescribeLoadBalancerAttributeResult::getListenerPortsAndProtocol()const
 {
-	return renewalCycUnit_;
+	return listenerPortsAndProtocol_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getPayType()const
+std::string DescribeLoadBalancerAttributeResult::getLoadBalancerId()const
 {
-	return payType_;
+	return loadBalancerId_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getReservedInfoActiveTime()const
+std::string DescribeLoadBalancerAttributeResult::getReservedInfoBandwidth()const
 {
-	return reservedInfoActiveTime_;
+	return reservedInfoBandwidth_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getCloudInstanceId()const
+std::string DescribeLoadBalancerAttributeResult::getModificationProtectionStatus()const
 {
-	return cloudInstanceId_;
+	return modificationProtectionStatus_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getSlaveZoneId()const
+std::string DescribeLoadBalancerAttributeResult::getNetworkType()const
 {
-	return slaveZoneId_;
+	return networkType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getInternetChargeType()const
+int DescribeLoadBalancerAttributeResult::getBandwidth()const
 {
-	return internetChargeType_;
+	return bandwidth_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getRegionIdAlias()const
+bool DescribeLoadBalancerAttributeResult::getSpecBpsFlag()const
 {
-	return regionIdAlias_;
+	return specBpsFlag_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getReservedInfoInternetChargeType()const
+std::string DescribeLoadBalancerAttributeResult::getMasterZoneId()const
 {
-	return reservedInfoInternetChargeType_;
+	return masterZoneId_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getLoadBalancerName()const
+std::string DescribeLoadBalancerAttributeResult::getTunnelType()const
 {
-	return loadBalancerName_;
+	return tunnelType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getVpcId()const
+std::string DescribeLoadBalancerAttributeResult::getCloudType()const
 {
-	return vpcId_;
+	return cloudType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getDeleteProtection()const
+std::string DescribeLoadBalancerAttributeResult::getCreateTime()const
 {
-	return deleteProtection_;
+	return createTime_;
 }
 
-long DescribeLoadBalancerAttributeResult::getEndTimeStamp()const
+long DescribeLoadBalancerAttributeResult::getCloudInstanceUid()const
 {
-	return endTimeStamp_;
+	return cloudInstanceUid_;
+}
+
+std::string DescribeLoadBalancerAttributeResult::getRenewalCycUnit()const
+{
+	return renewalCycUnit_;
+}
+
+std::string DescribeLoadBalancerAttributeResult::getReservedInfoActiveTime()const
+{
+	return reservedInfoActiveTime_;
+}
+
+std::string DescribeLoadBalancerAttributeResult::getCloudInstanceId()const
+{
+	return cloudInstanceId_;
+}
+
+std::string DescribeLoadBalancerAttributeResult::getSlaveZoneId()const
+{
+	return slaveZoneId_;
+}
+
+std::string DescribeLoadBalancerAttributeResult::getRegionIdAlias()const
+{
+	return regionIdAlias_;
+}
+
+std::string DescribeLoadBalancerAttributeResult::getLoadBalancerName()const
+{
+	return loadBalancerName_;
 }
 
 std::string DescribeLoadBalancerAttributeResult::getRegionId()const
@@ -403,18 +427,8 @@ std::string DescribeLoadBalancerAttributeResult::getAddressType()const
 	return addressType_;
 }
 
-std::string DescribeLoadBalancerAttributeResult::getLoadBalancerStatus()const
-{
-	return loadBalancerStatus_;
-}
-
 long DescribeLoadBalancerAttributeResult::getCreateTimeStamp()const
 {
 	return createTimeStamp_;
 }
 
-long DescribeLoadBalancerAttributeResult::getAutoReleaseTime()const
-{
-	return autoReleaseTime_;
-}
-

+ 4 - 0
slb/src/model/DescribeLoadBalancersResult.cc

@@ -93,6 +93,10 @@ void DescribeLoadBalancersResult::parse(const std::string &payload)
 			loadBalancersObject.loadBalancerSpec = valueLoadBalancersLoadBalancer["LoadBalancerSpec"].asString();
 		if(!valueLoadBalancersLoadBalancer["DeleteProtection"].isNull())
 			loadBalancersObject.deleteProtection = valueLoadBalancersLoadBalancer["DeleteProtection"].asString();
+		if(!valueLoadBalancersLoadBalancer["SpecBpsFlag"].isNull())
+			loadBalancersObject.specBpsFlag = valueLoadBalancersLoadBalancer["SpecBpsFlag"].asString() == "true";
+		if(!valueLoadBalancersLoadBalancer["SpecType"].isNull())
+			loadBalancersObject.specType = valueLoadBalancersLoadBalancer["SpecType"].asString();
 		auto allTagsNode = valueLoadBalancersLoadBalancer["Tags"]["Tag"];
 		for (auto valueLoadBalancersLoadBalancerTagsTag : allTagsNode)
 		{