v1.10.0

2024-12-27 11:35:22 +03:00
parent 88eb9e8898
commit e04dc42d2b
37 changed files with 516 additions and 274 deletions
--- a/tests/platform_upgrade/request_map.go
+++ b/tests/platform_upgrade/request_map.go
@@ -2,9 +2,11 @@ package test

 import (
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/account"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/audit"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/bservice"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/compute"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/disks"
+	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/dpdknet"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/extnet"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/flipgroup"
 	"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/image"
@@ -27,6 +29,7 @@ import (
 	backup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/backup"
 	compute_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/compute"
 	disks_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/disks"
+	dpdknet_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/dpdknet"
 	extnet_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/extnet"
 	flipgroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/flipgroup"
 	grid_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/grid"
@@ -78,6 +81,9 @@ func getRequestsMapCloudAPI() map[string]interface{} {
 		"/restmachine/cloudapi/account/update":                      account.UpdateRequest{},
 		"/restmachine/cloudapi/account/updateUser":                  account.UpdateUserRequest{},

+		//audit
+		"/restmachine/cloudapi/audit/get": audit.GetRequest{},
+
 		//bservice
 		"/restmachine/cloudapi/bservice/create":             bservice.CreateRequest{},
 		"/restmachine/cloudapi/bservice/delete":             bservice.DeleteRequest{},
@@ -107,7 +113,6 @@ func getRequestsMapCloudAPI() map[string]interface{} {
 		"/restmachine/cloudapi/bservice/stop":               bservice.StopRequest{},

 		// compute
-		"/restmachine/cloudapi/compute/affinityGroupCheckStart": compute.AffinityGroupCheckStartRequest{},
 		"/restmachine/cloudapi/compute/affinityLabelRemove":     compute.AffinityLabelRemoveRequest{},
 		"/restmachine/cloudapi/compute/affinityLabelSet":        compute.AffinityLabelSetRequest{},
 		"/restmachine/cloudapi/compute/affinityRelations":       compute.AffinityRelationsRequest{},
@@ -203,7 +208,6 @@ func getRequestsMapCloudAPI() map[string]interface{} {
 		"/restmachine/cloudapi/disks/replicationStatus":  disks.ReplicationStatusRequest{},
 		"/restmachine/cloudapi/disks/replicationStop":    disks.ReplicationStopRequest{},
 		"/restmachine/cloudapi/disks/replicationSuspend": disks.ReplicationSuspendRequest{},
-		"/restmachine/cloudapi/disks/resize":             disks.ResizeRequest{},
 		"/restmachine/cloudapi/disks/resize2":            disks.ResizeRequest{},
 		"/restmachine/cloudapi/disks/restore":            disks.RestoreRequest{},
 		"/restmachine/cloudapi/disks/search":             disks.SearchRequest{},
@@ -212,11 +216,16 @@ func getRequestsMapCloudAPI() map[string]interface{} {
 		"/restmachine/cloudapi/disks/snapshotRollback":   disks.SnapshotRollbackRequest{},
 		"/restmachine/cloudapi/disks/unshare":            disks.UnshareRequest{},

+		//dpdknet
+		"/restmachine/cloudapi/dpdknet/get":  dpdknet.GetRequest{},
+		"/restmachine/cloudapi/dpdknet/list": dpdknet.ListRequest{},
+
 		// extnet
-		"/restmachine/cloudapi/extnet/get":          extnet.GetRequest{},
-		"/restmachine/cloudapi/extnet/getDefault":   EmptyStruct{},
-		"/restmachine/cloudapi/extnet/list":         extnet.ListRequest{},
-		"/restmachine/cloudapi/extnet/listComputes": extnet.ListComputesRequest{},
+		"/restmachine/cloudapi/extnet/get":           extnet.GetRequest{},
+		"/restmachine/cloudapi/extnet/getDefault":    EmptyStruct{},
+		"/restmachine/cloudapi/extnet/getReservedIp": extnet.GetReservedIP{},
+		"/restmachine/cloudapi/extnet/list":          extnet.ListRequest{},
+		"/restmachine/cloudapi/extnet/listComputes":  extnet.ListComputesRequest{},

 		// flipgroup
 		"/restmachine/cloudapi/flipgroup/computeAdd":    flipgroup.ComputeAddRequest{},
@@ -353,34 +362,32 @@ func getRequestsMapCloudAPI() map[string]interface{} {
 		"/restmachine/cloudapi/vfpool/list": vfpool.ListRequest{},

 		// vins
-		"/restmachine/cloudapi/vins/audits":                  vins.AuditsRequest{},
-		"/restmachine/cloudapi/vins/createInAccount":         vins.CreateInAccountRequest{},
-		"/restmachine/cloudapi/vins/createInRG":              vins.CreateInRGRequest{},
-		"/restmachine/cloudapi/vins/delete":                  vins.DeleteRequest{},
-		"/restmachine/cloudapi/vins/disable":                 vins.DisableEnableRequest{},
-		"/restmachine/cloudapi/vins/dnsApply":                vins.DNSApplyRequest{},
-		"/restmachine/cloudapi/vins/enable":                  vins.DisableEnableRequest{},
-		"/restmachine/cloudapi/vins/extNetConnect":           vins.ExtNetConnectRequest{},
-		"/restmachine/cloudapi/vins/extNetDisconnect":        vins.ExtNetDisconnectRequest{},
-		"/restmachine/cloudapi/vins/extNetList":              vins.ExtNetListRequest{},
-		"/restmachine/cloudapi/vins/get":                     vins.GetRequest{},
-		"/restmachine/cloudapi/vins/ipList":                  vins.IPListRequest{},
-		"/restmachine/cloudapi/vins/ipRelease":               vins.IPReleaseRequest{},
-		"/restmachine/cloudapi/vins/ipReserve":               vins.IPReserveRequest{},
-		"/restmachine/cloudapi/vins/list":                    vins.ListRequest{},
-		"/restmachine/cloudapi/vins/listDeleted":             vins.ListDeletedRequest{},
-		"/restmachine/cloudapi/vins/natRuleAdd":              vins.NATRuleAddRequest{},
-		"/restmachine/cloudapi/vins/natRuleDel":              vins.NATRuleDelRequest{},
-		"/restmachine/cloudapi/vins/natRuleList":             vins.NATRuleListRequest{},
-		"/restmachine/cloudapi/vins/restore":                 vins.RestoreRequest{},
-		"/restmachine/cloudapi/vins/search":                  vins.SearchRequest{},
-		"/restmachine/cloudapi/vins/staticRouteAccessGrant":  vins.StaticRouteAccessGrantRequest{},
-		"/restmachine/cloudapi/vins/staticRouteAccessRevoke": vins.StaticRouteAccessRevokeRequest{},
-		"/restmachine/cloudapi/vins/staticRouteAdd":          vins.StaticRouteAddRequest{},
-		"/restmachine/cloudapi/vins/staticRouteDel":          vins.StaticRouteDelRequest{},
-		"/restmachine/cloudapi/vins/staticRouteList":         vins.StaticRouteListRequest{},
-		"/restmachine/cloudapi/vins/vnfdevRedeploy":          vins.VNFDevRedeployRequest{},
-		"/restmachine/cloudapi/vins/vnfdevRestart":           vins.VNFDevRestartRequest{},
+		"/restmachine/cloudapi/vins/audits":           vins.AuditsRequest{},
+		"/restmachine/cloudapi/vins/createInAccount":  vins.CreateInAccountRequest{},
+		"/restmachine/cloudapi/vins/createInRG":       vins.CreateInRGRequest{},
+		"/restmachine/cloudapi/vins/delete":           vins.DeleteRequest{},
+		"/restmachine/cloudapi/vins/disable":          vins.DisableEnableRequest{},
+		"/restmachine/cloudapi/vins/dnsApply":         vins.DNSApplyRequest{},
+		"/restmachine/cloudapi/vins/enable":           vins.DisableEnableRequest{},
+		"/restmachine/cloudapi/vins/extNetConnect":    vins.ExtNetConnectRequest{},
+		"/restmachine/cloudapi/vins/extNetDisconnect": vins.ExtNetDisconnectRequest{},
+		"/restmachine/cloudapi/vins/extNetList":       vins.ExtNetListRequest{},
+		"/restmachine/cloudapi/vins/get":              vins.GetRequest{},
+		"/restmachine/cloudapi/vins/ipList":           vins.IPListRequest{},
+		"/restmachine/cloudapi/vins/ipRelease":        vins.IPReleaseRequest{},
+		"/restmachine/cloudapi/vins/ipReserve":        vins.IPReserveRequest{},
+		"/restmachine/cloudapi/vins/list":             vins.ListRequest{},
+		"/restmachine/cloudapi/vins/listDeleted":      vins.ListDeletedRequest{},
+		"/restmachine/cloudapi/vins/natRuleAdd":       vins.NATRuleAddRequest{},
+		"/restmachine/cloudapi/vins/natRuleDel":       vins.NATRuleDelRequest{},
+		"/restmachine/cloudapi/vins/natRuleList":      vins.NATRuleListRequest{},
+		"/restmachine/cloudapi/vins/restore":          vins.RestoreRequest{},
+		"/restmachine/cloudapi/vins/search":           vins.SearchRequest{},
+		"/restmachine/cloudapi/vins/staticRouteAdd":   vins.StaticRouteAddRequest{},
+		"/restmachine/cloudapi/vins/staticRouteDel":   vins.StaticRouteDelRequest{},
+		"/restmachine/cloudapi/vins/staticRouteList":  vins.StaticRouteListRequest{},
+		"/restmachine/cloudapi/vins/vnfdevRedeploy":   vins.VNFDevRedeployRequest{},
+		"/restmachine/cloudapi/vins/vnfdevRestart":    vins.VNFDevRestartRequest{},
 	}
 }

@@ -576,12 +583,23 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/disks/snapshotRollback":   disks_cb.SnapshotRollbackRequest{},
 		"/restmachine/cloudbroker/disks/unshare":            disks_cb.UnshareRequest{},

+		// dpdknet
+		"/restmachine/cloudbroker/dpdknet/get":     dpdknet_cb.GetRequest{},
+		"/restmachine/cloudbroker/dpdknet/list":    dpdknet_cb.ListRequest{},
+		"/restmachine/cloudbroker/dpdknet/disable": dpdknet_cb.DisableRequest{},
+		"/restmachine/cloudbroker/dpdknet/enable":  dpdknet_cb.EnableRequest{},
+		"/restmachine/cloudbroker/dpdknet/create":  dpdknet_cb.CreateRequest{},
+		"/restmachine/cloudbroker/dpdknet/update":  dpdknet_cb.UpdateRequest{},
+		"/restmachine/cloudbroker/dpdknet/delete":  dpdknet_cb.DeleteRequest{},
+
 		// extnet
 		"/restmachine/cloudbroker/extnet/accessAdd":               extnet_cb.AccessAddRequest{},
 		"/restmachine/cloudbroker/extnet/accessRemove":            extnet_cb.AccessRemoveRequest{},
+		"/restmachine/cloudbroker/extnet/addReservedIp":           extnet_cb.AddReserveIPRequest{},
 		"/restmachine/cloudbroker/extnet/create":                  extnet_cb.CreateRequest{},
 		"/restmachine/cloudbroker/extnet/dnsApply":                extnet_cb.DNSApplyRequest{},
 		"/restmachine/cloudbroker/extnet/defaultQosUpdate":        extnet_cb.DefaultQOSUpdateRequest{},
+		"/restmachine/cloudbroker/extnet/delReservedIp":           extnet_cb.DelReserveIPRequest{},
 		"/restmachine/cloudbroker/extnet/destroy":                 extnet_cb.DestroyRequest{},
 		"/restmachine/cloudbroker/extnet/deviceDeploy":            extnet_cb.DeviceDeployRequest{},
 		"/restmachine/cloudbroker/extnet/deviceMigrate":           extnet_cb.DeviceMigrateRequest{},
@@ -591,6 +609,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/extnet/enable":                  extnet_cb.EnableRequest{},
 		"/restmachine/cloudbroker/extnet/get":                     extnet_cb.GetRequest{},
 		"/restmachine/cloudbroker/extnet/getDefault":              EmptyStruct{},
+		"/restmachine/cloudbroker/extnet/getReservedIp":           extnet.GetReservedIP{},
 		"/restmachine/cloudbroker/extnet/ipsExclude":              extnet_cb.IPsExcludeRequest{},
 		"/restmachine/cloudbroker/extnet/ipsExcludeRange":         extnet_cb.IPsExcludeRangeRequest{},
 		"/restmachine/cloudbroker/extnet/ipsInclude":              extnet_cb.IPsExcludeRequest{},
@@ -794,30 +813,29 @@ func getRequestsMapCloudbroker() map[string]interface{} {
 		"/restmachine/cloudbroker/rg/usage":                     rg_cb.UsageRequest{},

 		// sep
-		"/restmachine/cloudbroker/sep/accessGrant":         sep_cb.AccessGrantRequest{},
-		"/restmachine/cloudbroker/sep/accessGrantToPool":   sep_cb.AccessGrantToPoolRequest{},
-		"/restmachine/cloudbroker/sep/accessRevoke":        sep_cb.AccessRevokeRequest{},
-		"/restmachine/cloudbroker/sep/accessRevokeToPool":  sep_cb.AccessRevokeToPoolRequest{},
-		"/restmachine/cloudbroker/sep/addConsumerNodes":    sep_cb.AddConsumerNodesRequest{},
-		"/restmachine/cloudbroker/sep/addPool":             sep_cb.AddPoolRequest{},
-		"/restmachine/cloudbroker/sep/addProviderNodes":    sep_cb.AddProviderNodesRequest{},
-		"/restmachine/cloudbroker/sep/configFieldEdit":     sep_cb.ConfigFieldEditRequest{},
-		"/restmachine/cloudbroker/sep/configInsert":        sep_cb.ConfigInsertRequest{},
-		"/restmachine/cloudbroker/sep/configValidate":      sep_cb.ConfigValidateRequest{},
-		"/restmachine/cloudbroker/sep/consumption":         sep_cb.ConsumptionRequest{},
-		"/restmachine/cloudbroker/sep/create":              sep_cb.CreateRequest{},
-		"/restmachine/cloudbroker/sep/decommission":        sep_cb.DecommissionRequest{},
-		"/restmachine/cloudbroker/sep/delConsumerNodes":    sep_cb.DelConsumerNodesRequest{},
-		"/restmachine/cloudbroker/sep/delete":              sep_cb.DeleteRequest{},
-		"/restmachine/cloudbroker/sep/delPool":             sep_cb.DelPoolRequest{},
-		"/restmachine/cloudbroker/sep/disable":             sep_cb.DisableRequest{},
-		"/restmachine/cloudbroker/sep/diskList":            sep_cb.DiskListRequest{},
-		"/restmachine/cloudbroker/sep/enable":              sep_cb.EnableRequest{},
-		"/restmachine/cloudbroker/sep/get":                 sep_cb.GetRequest{},
-		"/restmachine/cloudbroker/sep/getConfig":           sep_cb.GetConfigRequest{},
-		"/restmachine/cloudbroker/sep/getPool":             sep_cb.GetPoolRequest{},
-		"/restmachine/cloudbroker/sep/list":                sep_cb.ListRequest{},
-		"/restmachine/cloudbroker/sep/updateCapacityLimit": sep_cb.UpdateCapacityLimitRequest{},
+		"/restmachine/cloudbroker/sep/accessGrant":        sep_cb.AccessGrantRequest{},
+		"/restmachine/cloudbroker/sep/accessGrantToPool":  sep_cb.AccessGrantToPoolRequest{},
+		"/restmachine/cloudbroker/sep/accessRevoke":       sep_cb.AccessRevokeRequest{},
+		"/restmachine/cloudbroker/sep/accessRevokeToPool": sep_cb.AccessRevokeToPoolRequest{},
+		"/restmachine/cloudbroker/sep/addConsumerNodes":   sep_cb.AddConsumerNodesRequest{},
+		"/restmachine/cloudbroker/sep/addPool":            sep_cb.AddPoolRequest{},
+		"/restmachine/cloudbroker/sep/addProviderNodes":   sep_cb.AddProviderNodesRequest{},
+		"/restmachine/cloudbroker/sep/configFieldEdit":    sep_cb.ConfigFieldEditRequest{},
+		"/restmachine/cloudbroker/sep/configInsert":       sep_cb.ConfigInsertRequest{},
+		"/restmachine/cloudbroker/sep/configValidate":     sep_cb.ConfigValidateRequest{},
+		"/restmachine/cloudbroker/sep/consumption":        sep_cb.ConsumptionRequest{},
+		"/restmachine/cloudbroker/sep/create":             sep_cb.CreateRequest{},
+		"/restmachine/cloudbroker/sep/decommission":       sep_cb.DecommissionRequest{},
+		"/restmachine/cloudbroker/sep/delConsumerNodes":   sep_cb.DelConsumerNodesRequest{},
+		"/restmachine/cloudbroker/sep/delete":             sep_cb.DeleteRequest{},
+		"/restmachine/cloudbroker/sep/delPool":            sep_cb.DelPoolRequest{},
+		"/restmachine/cloudbroker/sep/disable":            sep_cb.DisableRequest{},
+		"/restmachine/cloudbroker/sep/diskList":           sep_cb.DiskListRequest{},
+		"/restmachine/cloudbroker/sep/enable":             sep_cb.EnableRequest{},
+		"/restmachine/cloudbroker/sep/get":                sep_cb.GetRequest{},
+		"/restmachine/cloudbroker/sep/getConfig":          sep_cb.GetConfigRequest{},
+		"/restmachine/cloudbroker/sep/getPool":            sep_cb.GetPoolRequest{},
+		"/restmachine/cloudbroker/sep/list":               sep_cb.ListRequest{},

 		// stack
 		"/restmachine/cloudbroker/stack/get":                   stack_cb.GetRequest{},