Update encoding of 'details' maps (#86)
Update encoding of 'details' maps
diff --git a/cloudstack/CustomService.go b/cloudstack/CustomService.go
index 9791718..f20219f 100644
--- a/cloudstack/CustomService.go
+++ b/cloudstack/CustomService.go
@@ -50,8 +50,7 @@
case map[string]string:
i := 0
for kk, vv := range t {
- u.Set(fmt.Sprintf("k[%d].key", i), kk)
- u.Set(fmt.Sprintf("k[%d].value", i), vv)
+ u.Set(fmt.Sprintf("%s[%d].%s", k, i, kk), vv)
i++
}
}
diff --git a/cloudstack/ISOService.go b/cloudstack/ISOService.go
index 402b233..d798c91 100644
--- a/cloudstack/ISOService.go
+++ b/cloudstack/ISOService.go
@@ -1185,8 +1185,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/ImageStoreService.go b/cloudstack/ImageStoreService.go
index cb1dce6..2741f50 100644
--- a/cloudstack/ImageStoreService.go
+++ b/cloudstack/ImageStoreService.go
@@ -36,8 +36,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -599,8 +598,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -984,8 +982,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/NetworkOfferingService.go b/cloudstack/NetworkOfferingService.go
index 43968bd..cf567ff 100644
--- a/cloudstack/NetworkOfferingService.go
+++ b/cloudstack/NetworkOfferingService.go
@@ -43,8 +43,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/PoolService.go b/cloudstack/PoolService.go
index 94da4d6..e84a8eb 100644
--- a/cloudstack/PoolService.go
+++ b/cloudstack/PoolService.go
@@ -319,8 +319,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/ResourcemetadataService.go b/cloudstack/ResourcemetadataService.go
index 3da6e23..ea5b16b 100644
--- a/cloudstack/ResourcemetadataService.go
+++ b/cloudstack/ResourcemetadataService.go
@@ -35,8 +35,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/SystemVMService.go b/cloudstack/SystemVMService.go
index d0b14b1..8406fee 100644
--- a/cloudstack/SystemVMService.go
+++ b/cloudstack/SystemVMService.go
@@ -832,8 +832,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -938,8 +937,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/TemplateService.go b/cloudstack/TemplateService.go
index f4c235c..2b2abc3 100644
--- a/cloudstack/TemplateService.go
+++ b/cloudstack/TemplateService.go
@@ -40,8 +40,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -342,8 +341,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -689,8 +687,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -2057,8 +2054,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/VirtualMachineService.go b/cloudstack/VirtualMachineService.go
index 56e7bdd..c689db1 100644
--- a/cloudstack/VirtualMachineService.go
+++ b/cloudstack/VirtualMachineService.go
@@ -53,8 +53,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -1889,8 +1888,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -3195,8 +3193,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
@@ -3446,8 +3443,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/cloudstack/ZoneService.go b/cloudstack/ZoneService.go
index 88bc0c3..3f0622d 100644
--- a/cloudstack/ZoneService.go
+++ b/cloudstack/ZoneService.go
@@ -282,8 +282,7 @@
if v, found := p.p["details"]; found {
i := 0
for k, vv := range v.(map[string]string) {
- u.Set(fmt.Sprintf("details[%d].key", i), k)
- u.Set(fmt.Sprintf("details[%d].value", i), vv)
+ u.Set(fmt.Sprintf("details[%d].%s", i, k), vv)
i++
}
}
diff --git a/generate/generate.go b/generate/generate.go
index d36abfb..087b19c 100644
--- a/generate/generate.go
+++ b/generate/generate.go
@@ -689,8 +689,7 @@
pn(" case map[string]string:")
pn(" i := 0")
pn(" for kk, vv := range t {")
- pn(" u.Set(fmt.Sprintf(\"k[%%d].key\", i), kk)")
- pn(" u.Set(fmt.Sprintf(\"k[%%d].value\", i), vv)")
+ pn(" u.Set(fmt.Sprintf(\"%%s[%%d].%%s\", k, i, kk), vv)")
pn(" i++")
pn(" }")
pn(" }")
@@ -785,6 +784,8 @@
pn("i := 0")
pn("for k, vv := range v.(map[string]string) {")
switch name {
+ case "details":
+ pn(" u.Set(fmt.Sprintf(\"%s[%%d].%%s\", i, k), vv)", name)
case "serviceproviderlist":
pn(" u.Set(fmt.Sprintf(\"%s[%%d].service\", i), k)", name)
pn(" u.Set(fmt.Sprintf(\"%s[%%d].provider\", i), vv)", name)
