diff --git a/go.mod b/go.mod index 6db01b110d..6003b9fafa 100644 --- a/go.mod +++ b/go.mod @@ -97,7 +97,7 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251015023237-11272a18e0d6 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251022024155-0af17b1ec9e6 yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index 3cdf404c8e..2e5fc7138a 100644 --- a/go.sum +++ b/go.sum @@ -1470,8 +1470,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251015023237-11272a18e0d6 h1:8cX/qRtJk/cWX4eSuuR1ehi53VXp/L3Cbir85GYEQSk= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251015023237-11272a18e0d6/go.mod h1:qn8eC11Gn4/41YJRzQcwB/G1Z3rQRxRrDNC8LDvQR48= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251022024155-0af17b1ec9e6 h1:rClhWP2jjm9IZG2+c8ixOgR5RXeLHh+GFiFsrmmcKk4= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251022024155-0af17b1ec9e6/go.mod h1:qn8eC11Gn4/41YJRzQcwB/G1Z3rQRxRrDNC8LDvQR48= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0 h1:msG4SiDSVU7CrXH06WuHlNEZXIooTcmNbfrIGHuIHBU= yunion.io/x/executor v0.0.0-20250518005516-5402e9e0bed0/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c77cb1391..a45b0ae0e2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2037,7 +2037,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251015023237-11272a18e0d6 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20251022024155-0af17b1ec9e6 ## explicit; go 1.24 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/secgrouprule.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/secgrouprule.go index 4c8b1a32bb..04c7c25206 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/secgrouprule.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/secgrouprule.go @@ -15,7 +15,6 @@ package huawei import ( - "fmt" "net/url" "strings" @@ -32,14 +31,14 @@ type SecurityGroupRule struct { Ethertype string Id string Description string - PortRangeMax int64 - PortRangeMin int64 + Multiport string Protocol string RemoteGroupId string RemoteIPPrefix string SecurityGroupId string TenantId string Priority int + Action string } func (self *SecurityGroupRule) GetGlobalId() string { @@ -62,7 +61,10 @@ func (self *SecurityGroupRule) GetPriority() int { } func (self *SecurityGroupRule) GetAction() secrules.TSecurityRuleAction { - return secrules.SecurityRuleAllow + if self.Action == "allow" { + return secrules.SecurityRuleAllow + } + return secrules.SecurityRuleDeny } func (self *SecurityGroupRule) GetProtocol() string { @@ -73,17 +75,7 @@ func (self *SecurityGroupRule) GetProtocol() string { } func (self *SecurityGroupRule) GetPorts() string { - if self.PortRangeMax > 0 && self.PortRangeMin > 0 { - if self.PortRangeMax == self.PortRangeMin { - return fmt.Sprintf("%d", self.PortRangeMax) - } - return fmt.Sprintf("%d-%d", self.PortRangeMin, self.PortRangeMax) - } - return "" -} - -type SPageInfo struct { - NextMarker string + return self.Multiport } func (self *SecurityGroupRule) GetCIDRs() []string { @@ -121,7 +113,9 @@ func (self *SRegion) GetSecurityGroupRules(groupId string) ([]SecurityGroupRule, } part := struct { SecurityGroupRules []SecurityGroupRule - PageInfo SPageInfo + PageInfo struct { + NextMarker string + } }{} err = resp.Unmarshal(&part) if err != nil {