This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-go.git
The following commit(s) were added to refs/heads/main by this push:
new 1cd3965 Generate account details correctly
(accountdetails[0].somekey=someval) (#46)
1cd3965 is described below
commit 1cd3965ca40dc316dc73c04f0f60752863324502
Author: Marcus Sorensen <[email protected]>
AuthorDate: Fri Mar 10 05:01:56 2023 -0700
Generate account details correctly (accountdetails[0].somekey=someval) (#46)
Co-authored-by: Marcus Sorensen <[email protected]>
---
cloudstack/AccountService.go | 10 ++++------
cloudstack/BigSwitchBCFService.go | 2 +-
cloudstack/BrocadeVCSService.go | 2 +-
cloudstack/FirewallService.go | 2 +-
cloudstack/LoadBalancerService.go | 2 +-
cloudstack/NiciraNVPService.go | 2 +-
generate/generate.go | 10 ++++++++--
7 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/cloudstack/AccountService.go b/cloudstack/AccountService.go
index 66270b6..75e4edd 100644
--- a/cloudstack/AccountService.go
+++ b/cloudstack/AccountService.go
@@ -68,9 +68,8 @@ func (p *CreateAccountParams) toURLValues() url.Values {
}
if v, found := p.p["accountdetails"]; found {
m := v.(map[string]string)
- for i, k := range getSortedKeysFromMap(m) {
- u.Set(fmt.Sprintf("accountdetails[%d].key", i), k)
- u.Set(fmt.Sprintf("accountdetails[%d].value", i), m[k])
+ for _, k := range getSortedKeysFromMap(m) {
+ u.Set(fmt.Sprintf("accountdetails[0].%s", k), m[k])
}
}
if v, found := p.p["accountid"]; found {
@@ -2114,9 +2113,8 @@ func (p *UpdateAccountParams) toURLValues() url.Values {
}
if v, found := p.p["accountdetails"]; found {
m := v.(map[string]string)
- for i, k := range getSortedKeysFromMap(m) {
- u.Set(fmt.Sprintf("accountdetails[%d].key", i), k)
- u.Set(fmt.Sprintf("accountdetails[%d].value", i), m[k])
+ for _, k := range getSortedKeysFromMap(m) {
+ u.Set(fmt.Sprintf("accountdetails[0].%s", k), m[k])
}
}
if v, found := p.p["domainid"]; found {
diff --git a/cloudstack/BigSwitchBCFService.go
b/cloudstack/BigSwitchBCFService.go
index 5fbef5f..de4ca0f 100644
--- a/cloudstack/BigSwitchBCFService.go
+++ b/cloudstack/BigSwitchBCFService.go
@@ -237,7 +237,7 @@ func (s *BigSwitchBCFService)
NewDeleteBigSwitchBcfDeviceParams(bcfdeviceid stri
return p
}
-// delete a BigSwitch BCF Controller device
+// delete a BigSwitch BCF Controller device
func (s *BigSwitchBCFService) DeleteBigSwitchBcfDevice(p
*DeleteBigSwitchBcfDeviceParams) (*DeleteBigSwitchBcfDeviceResponse, error) {
resp, err := s.cs.newRequest("deleteBigSwitchBcfDevice",
p.toURLValues())
if err != nil {
diff --git a/cloudstack/BrocadeVCSService.go b/cloudstack/BrocadeVCSService.go
index fc90274..1587ecd 100644
--- a/cloudstack/BrocadeVCSService.go
+++ b/cloudstack/BrocadeVCSService.go
@@ -218,7 +218,7 @@ func (s *BrocadeVCSService)
NewDeleteBrocadeVcsDeviceParams(vcsdeviceid string)
return p
}
-// delete a Brocade VCS Switch
+// delete a Brocade VCS Switch
func (s *BrocadeVCSService) DeleteBrocadeVcsDevice(p
*DeleteBrocadeVcsDeviceParams) (*DeleteBrocadeVcsDeviceResponse, error) {
resp, err := s.cs.newRequest("deleteBrocadeVcsDevice", p.toURLValues())
if err != nil {
diff --git a/cloudstack/FirewallService.go b/cloudstack/FirewallService.go
index 165b4a9..dd4f267 100644
--- a/cloudstack/FirewallService.go
+++ b/cloudstack/FirewallService.go
@@ -1438,7 +1438,7 @@ func (s *FirewallService)
NewDeletePaloAltoFirewallParams(fwdeviceid string) *De
return p
}
-// delete a Palo Alto firewall device
+// delete a Palo Alto firewall device
func (s *FirewallService) DeletePaloAltoFirewall(p
*DeletePaloAltoFirewallParams) (*DeletePaloAltoFirewallResponse, error) {
resp, err := s.cs.newRequest("deletePaloAltoFirewall", p.toURLValues())
if err != nil {
diff --git a/cloudstack/LoadBalancerService.go
b/cloudstack/LoadBalancerService.go
index 3d25513..6548401 100644
--- a/cloudstack/LoadBalancerService.go
+++ b/cloudstack/LoadBalancerService.go
@@ -2582,7 +2582,7 @@ func (s *LoadBalancerService)
NewDeleteNetscalerLoadBalancerParams(lbdeviceid st
return p
}
-// delete a netscaler load balancer device
+// delete a netscaler load balancer device
func (s *LoadBalancerService) DeleteNetscalerLoadBalancer(p
*DeleteNetscalerLoadBalancerParams) (*DeleteNetscalerLoadBalancerResponse,
error) {
resp, err := s.cs.newRequest("deleteNetscalerLoadBalancer",
p.toURLValues())
if err != nil {
diff --git a/cloudstack/NiciraNVPService.go b/cloudstack/NiciraNVPService.go
index 5b96750..3964997 100644
--- a/cloudstack/NiciraNVPService.go
+++ b/cloudstack/NiciraNVPService.go
@@ -272,7 +272,7 @@ func (s *NiciraNVPService)
NewDeleteNiciraNvpDeviceParams(nvpdeviceid string) *D
return p
}
-// delete a nicira nvp device
+// delete a nicira nvp device
func (s *NiciraNVPService) DeleteNiciraNvpDevice(p
*DeleteNiciraNvpDeviceParams) (*DeleteNiciraNvpDeviceResponse, error) {
resp, err := s.cs.newRequest("deleteNiciraNvpDevice", p.toURLValues())
if err != nil {
diff --git a/generate/generate.go b/generate/generate.go
index 37c920d..9906f18 100644
--- a/generate/generate.go
+++ b/generate/generate.go
@@ -54,6 +54,8 @@ var detailsRequireKeyValue = map[string]bool{
var detailsRequireZeroIndex = map[string]bool{
"registerTemplate": true,
"updateTemplate": true,
+ "createAccount": true,
+ "updateAccount": true,
}
var mapRequireList = map[string]map[string]bool{
@@ -1336,8 +1338,12 @@ func (s *service) generateConvertCode(cmd, name, typ
string) {
pn(" u.Set(fmt.Sprintf(\"%s[%%d].value\",
i), m[k])", name)
}
default:
- pn(" u.Set(fmt.Sprintf(\"%s[%%d].key\", i), k)",
name)
- pn(" u.Set(fmt.Sprintf(\"%s[%%d].value\", i),
m[k])", name)
+ if zeroIndex && !detailsRequireKeyValue[cmd] {
+ pn(" u.Set(fmt.Sprintf(\"%s[0].%%s\", k),
m[k])", name)
+ } else {
+ pn(" u.Set(fmt.Sprintf(\"%s[%%d].key\", i),
k)", name)
+ pn(" u.Set(fmt.Sprintf(\"%s[%%d].value\",
i), m[k])", name)
+ }
}
pn("}")
}
