Skip to content

Commit 290c626

Browse files
sbruesekesbrueseke
authored
Merge branch 'apache:main' into main
2 parents 74e8f2e + afbda39 commit 290c626

33 files changed

+88040
-78902
lines changed

‎cloudstack/AddressService.go

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type AddressServiceIface interface {
3131
AssociateIpAddress(p *AssociateIpAddressParams) (*AssociateIpAddressResponse, error)
3232
NewAssociateIpAddressParams() *AssociateIpAddressParams
3333
DisassociateIpAddress(p *DisassociateIpAddressParams) (*DisassociateIpAddressResponse, error)
34-
NewDisassociateIpAddressParams(id string) *DisassociateIpAddressParams
34+
NewDisassociateIpAddressParams() *DisassociateIpAddressParams
3535
ListPublicIpAddresses(p *ListPublicIpAddressesParams) (*ListPublicIpAddressesResponse, error)
3636
NewListPublicIpAddressesParams() *ListPublicIpAddressesParams
3737
GetPublicIpAddressByID(id string, opts ...OptionFunc) (*PublicIpAddress, int, error)
@@ -331,6 +331,9 @@ func (p *DisassociateIpAddressParams) toURLValues() url.Values {
331331
if v, found := p.p["id"]; found {
332332
u.Set("id", v.(string))
333333
}
334+
if v, found := p.p["ipaddress"]; found {
335+
u.Set("ipaddress", v.(string))
336+
}
334337
return u
335338
}
336339

@@ -349,12 +352,26 @@ func (p *DisassociateIpAddressParams) GetId() (string, bool) {
349352
return value, ok
350353
}
351354

355+
func (p *DisassociateIpAddressParams) SetIpaddress(v string) {
356+
if p.p == nil {
357+
p.p = make(map[string]interface{})
358+
}
359+
p.p["ipaddress"] = v
360+
}
361+
362+
func (p *DisassociateIpAddressParams) GetIpaddress() (string, bool) {
363+
if p.p == nil {
364+
p.p = make(map[string]interface{})
365+
}
366+
value, ok := p.p["ipaddress"].(string)
367+
return value, ok
368+
}
369+
352370
// You should always use this function to get a new DisassociateIpAddressParams instance,
353371
// as then you are sure you have configured all required params
354-
func (s *AddressService) NewDisassociateIpAddressParams(id string) *DisassociateIpAddressParams {
372+
func (s *AddressService) NewDisassociateIpAddressParams() *DisassociateIpAddressParams {
355373
p := &DisassociateIpAddressParams{}
356374
p.p = make(map[string]interface{})
357-
p.p["id"] = id
358375
return p
359376
}
360377

‎cloudstack/AddressService_mock.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloudstack/AffinityGroupService.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,7 @@ type UpdateVMAffinityGroupResponse struct {
10261026
Templatedisplaytext string `json:"templatedisplaytext"`
10271027
Templateid string `json:"templateid"`
10281028
Templatename string `json:"templatename"`
1029+
Templatetype string `json:"templatetype"`
10291030
Userdata string `json:"userdata"`
10301031
Userdatadetails string `json:"userdatadetails"`
10311032
Userdataid string `json:"userdataid"`
@@ -1034,6 +1035,8 @@ type UpdateVMAffinityGroupResponse struct {
10341035
Userid string `json:"userid"`
10351036
Username string `json:"username"`
10361037
Vgpu string `json:"vgpu"`
1038+
Vnfdetails map[string]string `json:"vnfdetails"`
1039+
Vnfnics []string `json:"vnfnics"`
10371040
Zoneid string `json:"zoneid"`
10381041
Zonename string `json:"zonename"`
10391042
}

‎cloudstack/AutoScaleService.go

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,16 @@ func (p *CreateAutoScaleVmProfileParams) toURLValues() url.Values {
560560
if v, found := p.p["userdata"]; found {
561561
u.Set("userdata", v.(string))
562562
}
563+
if v, found := p.p["userdatadetails"]; found {
564+
m := v.(map[string]string)
565+
for i, k := range getSortedKeysFromMap(m) {
566+
u.Set(fmt.Sprintf("userdatadetails[%d].key", i), k)
567+
u.Set(fmt.Sprintf("userdatadetails[%d].value", i), m[k])
568+
}
569+
}
570+
if v, found := p.p["userdataid"]; found {
571+
u.Set("userdataid", v.(string))
572+
}
563573
if v, found := p.p["zoneid"]; found {
564574
u.Set("zoneid", v.(string))
565575
}
@@ -731,6 +741,36 @@ func (p *CreateAutoScaleVmProfileParams) GetUserdata() (string, bool) {
731741
return value, ok
732742
}
733743

744+
func (p *CreateAutoScaleVmProfileParams) SetUserdatadetails(v map[string]string) {
745+
if p.p == nil {
746+
p.p = make(map[string]interface{})
747+
}
748+
p.p["userdatadetails"] = v
749+
}
750+
751+
func (p *CreateAutoScaleVmProfileParams) GetUserdatadetails() (map[string]string, bool) {
752+
if p.p == nil {
753+
p.p = make(map[string]interface{})
754+
}
755+
value, ok := p.p["userdatadetails"].(map[string]string)
756+
return value, ok
757+
}
758+
759+
func (p *CreateAutoScaleVmProfileParams) SetUserdataid(v string) {
760+
if p.p == nil {
761+
p.p = make(map[string]interface{})
762+
}
763+
p.p["userdataid"] = v
764+
}
765+
766+
func (p *CreateAutoScaleVmProfileParams) GetUserdataid() (string, bool) {
767+
if p.p == nil {
768+
p.p = make(map[string]interface{})
769+
}
770+
value, ok := p.p["userdataid"].(string)
771+
return value, ok
772+
}
773+
734774
func (p *CreateAutoScaleVmProfileParams) SetZoneid(v string) {
735775
if p.p == nil {
736776
p.p = make(map[string]interface{})
@@ -808,6 +848,10 @@ type CreateAutoScaleVmProfileResponse struct {
808848
Serviceofferingid string `json:"serviceofferingid"`
809849
Templateid string `json:"templateid"`
810850
Userdata string `json:"userdata"`
851+
Userdatadetails string `json:"userdatadetails"`
852+
Userdataid string `json:"userdataid"`
853+
Userdataname string `json:"userdataname"`
854+
Userdatapolicy string `json:"userdatapolicy"`
811855
Zoneid string `json:"zoneid"`
812856
}
813857

@@ -2898,6 +2942,10 @@ type AutoScaleVmProfile struct {
28982942
Serviceofferingid string `json:"serviceofferingid"`
28992943
Templateid string `json:"templateid"`
29002944
Userdata string `json:"userdata"`
2945+
Userdatadetails string `json:"userdatadetails"`
2946+
Userdataid string `json:"userdataid"`
2947+
Userdataname string `json:"userdataname"`
2948+
Userdatapolicy string `json:"userdatapolicy"`
29012949
Zoneid string `json:"zoneid"`
29022950
}
29032951

@@ -3924,6 +3972,16 @@ func (p *UpdateAutoScaleVmProfileParams) toURLValues() url.Values {
39243972
if v, found := p.p["userdata"]; found {
39253973
u.Set("userdata", v.(string))
39263974
}
3975+
if v, found := p.p["userdatadetails"]; found {
3976+
m := v.(map[string]string)
3977+
for i, k := range getSortedKeysFromMap(m) {
3978+
u.Set(fmt.Sprintf("userdatadetails[%d].key", i), k)
3979+
u.Set(fmt.Sprintf("userdatadetails[%d].value", i), m[k])
3980+
}
3981+
}
3982+
if v, found := p.p["userdataid"]; found {
3983+
u.Set("userdataid", v.(string))
3984+
}
39273985
return u
39283986
}
39293987

@@ -4077,6 +4135,36 @@ func (p *UpdateAutoScaleVmProfileParams) GetUserdata() (string, bool) {
40774135
return value, ok
40784136
}
40794137

4138+
func (p *UpdateAutoScaleVmProfileParams) SetUserdatadetails(v map[string]string) {
4139+
if p.p == nil {
4140+
p.p = make(map[string]interface{})
4141+
}
4142+
p.p["userdatadetails"] = v
4143+
}
4144+
4145+
func (p *UpdateAutoScaleVmProfileParams) GetUserdatadetails() (map[string]string, bool) {
4146+
if p.p == nil {
4147+
p.p = make(map[string]interface{})
4148+
}
4149+
value, ok := p.p["userdatadetails"].(map[string]string)
4150+
return value, ok
4151+
}
4152+
4153+
func (p *UpdateAutoScaleVmProfileParams) SetUserdataid(v string) {
4154+
if p.p == nil {
4155+
p.p = make(map[string]interface{})
4156+
}
4157+
p.p["userdataid"] = v
4158+
}
4159+
4160+
func (p *UpdateAutoScaleVmProfileParams) GetUserdataid() (string, bool) {
4161+
if p.p == nil {
4162+
p.p = make(map[string]interface{})
4163+
}
4164+
value, ok := p.p["userdataid"].(string)
4165+
return value, ok
4166+
}
4167+
40804168
// You should always use this function to get a new UpdateAutoScaleVmProfileParams instance,
40814169
// as then you are sure you have configured all required params
40824170
func (s *AutoScaleService) NewUpdateAutoScaleVmProfileParams(id string) *UpdateAutoScaleVmProfileParams {
@@ -4137,5 +4225,9 @@ type UpdateAutoScaleVmProfileResponse struct {
41374225
Serviceofferingid string `json:"serviceofferingid"`
41384226
Templateid string `json:"templateid"`
41394227
Userdata string `json:"userdata"`
4228+
Userdatadetails string `json:"userdatadetails"`
4229+
Userdataid string `json:"userdataid"`
4230+
Userdataname string `json:"userdataname"`
4231+
Userdatapolicy string `json:"userdatapolicy"`
41404232
Zoneid string `json:"zoneid"`
41414233
}

‎cloudstack/BrocadeVCSService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ type BrocadeVcsDeviceNetwork struct {
426426
Dns2 string `json:"dns2"`
427427
Domain string `json:"domain"`
428428
Domainid string `json:"domainid"`
429+
Domainpath string `json:"domainpath"`
429430
Egressdefaultpolicy bool `json:"egressdefaultpolicy"`
430431
Externalid string `json:"externalid"`
431432
Gateway string `json:"gateway"`

‎cloudstack/ConfigurationService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ type Capability struct {
8888
Cloudstackversion string `json:"cloudstackversion"`
8989
Customdiskofferingmaxsize int64 `json:"customdiskofferingmaxsize"`
9090
Customdiskofferingminsize int64 `json:"customdiskofferingminsize"`
91+
Customhypervisordisplayname string `json:"customhypervisordisplayname"`
9192
Defaultuipagesize int64 `json:"defaultuipagesize"`
9293
Dynamicrolesenabled bool `json:"dynamicrolesenabled"`
9394
Instancesdisksstatsretentionenabled bool `json:"instancesdisksstatsretentionenabled"`

‎cloudstack/DiskOfferingService.go

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,9 @@ func (p *ListDiskOfferingsParams) toURLValues() url.Values {
803803
if p.p == nil {
804804
return u
805805
}
806+
if v, found := p.p["account"]; found {
807+
u.Set("account", v.(string))
808+
}
806809
if v, found := p.p["domainid"]; found {
807810
u.Set("domainid", v.(string))
808811
}
@@ -835,9 +838,15 @@ func (p *ListDiskOfferingsParams) toURLValues() url.Values {
835838
vv := strconv.Itoa(v.(int))
836839
u.Set("pagesize", vv)
837840
}
841+
if v, found := p.p["projectid"]; found {
842+
u.Set("projectid", v.(string))
843+
}
838844
if v, found := p.p["storageid"]; found {
839845
u.Set("storageid", v.(string))
840846
}
847+
if v, found := p.p["storagetype"]; found {
848+
u.Set("storagetype", v.(string))
849+
}
841850
if v, found := p.p["volumeid"]; found {
842851
u.Set("volumeid", v.(string))
843852
}
@@ -847,6 +856,21 @@ func (p *ListDiskOfferingsParams) toURLValues() url.Values {
847856
return u
848857
}
849858

859+
func (p *ListDiskOfferingsParams) SetAccount(v string) {
860+
if p.p == nil {
861+
p.p = make(map[string]interface{})
862+
}
863+
p.p["account"] = v
864+
}
865+
866+
func (p *ListDiskOfferingsParams) GetAccount() (string, bool) {
867+
if p.p == nil {
868+
p.p = make(map[string]interface{})
869+
}
870+
value, ok := p.p["account"].(string)
871+
return value, ok
872+
}
873+
850874
func (p *ListDiskOfferingsParams) SetDomainid(v string) {
851875
if p.p == nil {
852876
p.p = make(map[string]interface{})
@@ -982,6 +1006,21 @@ func (p *ListDiskOfferingsParams) GetPagesize() (int, bool) {
9821006
return value, ok
9831007
}
9841008

1009+
func (p *ListDiskOfferingsParams) SetProjectid(v string) {
1010+
if p.p == nil {
1011+
p.p = make(map[string]interface{})
1012+
}
1013+
p.p["projectid"] = v
1014+
}
1015+
1016+
func (p *ListDiskOfferingsParams) GetProjectid() (string, bool) {
1017+
if p.p == nil {
1018+
p.p = make(map[string]interface{})
1019+
}
1020+
value, ok := p.p["projectid"].(string)
1021+
return value, ok
1022+
}
1023+
9851024
func (p *ListDiskOfferingsParams) SetStorageid(v string) {
9861025
if p.p == nil {
9871026
p.p = make(map[string]interface{})
@@ -997,6 +1036,21 @@ func (p *ListDiskOfferingsParams) GetStorageid() (string, bool) {
9971036
return value, ok
9981037
}
9991038

1039+
func (p *ListDiskOfferingsParams) SetStoragetype(v string) {
1040+
if p.p == nil {
1041+
p.p = make(map[string]interface{})
1042+
}
1043+
p.p["storagetype"] = v
1044+
}
1045+
1046+
func (p *ListDiskOfferingsParams) GetStoragetype() (string, bool) {
1047+
if p.p == nil {
1048+
p.p = make(map[string]interface{})
1049+
}
1050+
value, ok := p.p["storagetype"].(string)
1051+
return value, ok
1052+
}
1053+
10001054
func (p *ListDiskOfferingsParams) SetVolumeid(v string) {
10011055
if p.p == nil {
10021056
p.p = make(map[string]interface{})

0 commit comments

Comments
 (0)