This commit is contained in:
dayterr
2025-09-11 15:56:44 +03:00
parent 825b1a0a00
commit abd35f858c
87 changed files with 930 additions and 571 deletions

View File

@@ -17,10 +17,10 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/lb"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/locations"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
securitygroup "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/security_group"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/secgroup"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/sep"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
storagepolicy "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/storage_policy"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stpolicy"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/trunk"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/vins"
@@ -42,10 +42,10 @@ import (
node_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/node"
pcidevice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/pcidevice"
rg_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
securitygroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/security_group"
secgroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/secgroup"
sep_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep"
stack_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stack"
storagepolicy_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/storage_policy"
stpolicy_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stpolicy"
tasks_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/tasks"
trunk_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/trunk"
vins_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/vins"
@@ -308,40 +308,40 @@ func TestGetListCloudAPI(t *testing.T) {
// Storage policy
// List
bytes, err = client.CloudAPI().StoragePolicy().ListRaw(context.Background(), storagepolicy.ListRequest{})
bytes, err = client.CloudAPI().StPolicy().ListRaw(context.Background(), stpolicy.ListRequest{})
if err != nil {
t.Error(err)
}
getResult("Storage policy list", bytes, storagepolicy.ListStoragePolicies{}, t)
getResult("Storage policy list", bytes, stpolicy.ListStoragePolicies{}, t)
// Get
listStoragePolicies, _ := client.CloudAPI().StoragePolicy().List(context.Background(), storagepolicy.ListRequest{})
listStoragePolicies, _ := client.CloudAPI().StPolicy().List(context.Background(), stpolicy.ListRequest{})
if len(listStoragePolicies.Data) > 0 {
id := listStoragePolicies.Data[0].ID
bytes, err = client.CloudAPI().StoragePolicy().GetRaw(context.Background(), storagepolicy.GetRequest{StoragePolicyID: id})
bytes, err = client.CloudAPI().StPolicy().GetRaw(context.Background(), stpolicy.GetRequest{StoragePolicyID: id})
if err != nil {
t.Error(err)
}
getResult("Storage policy get", bytes, storagepolicy.InfoStoragePolicy{}, t)
getResult("Storage policy get", bytes, stpolicy.InfoStoragePolicy{}, t)
} else {
t.Errorf("Can not test Storage policy get because Storage policy list is empty")
}
// Security group
// List
bytes, err = client.CloudAPI().SecurityGroup().ListRaw(context.Background(), securitygroup.ListRequest{})
bytes, err = client.CloudAPI().SecurityGroup().ListRaw(context.Background(), secgroup.ListRequest{})
if err != nil {
t.Error(err)
}
getResult("Security group list", bytes, securitygroup.ListSecurityGroups{}, t)
getResult("Security group list", bytes, secgroup.ListSecurityGroups{}, t)
// Get
listSecurityGroups, _ := client.CloudAPI().SecurityGroup().List(context.Background(), securitygroup.ListRequest{})
listSecurityGroups, _ := client.CloudAPI().SecurityGroup().List(context.Background(), secgroup.ListRequest{})
if len(listSecurityGroups.Data) > 0 {
id := listSecurityGroups.Data[0].ID
bytes, err = client.CloudAPI().SecurityGroup().GetRaw(context.Background(), securitygroup.GetRequest{SecurityGroupID: id})
bytes, err = client.CloudAPI().SecurityGroup().GetRaw(context.Background(), secgroup.GetRequest{SecurityGroupID: id})
if err != nil {
t.Error(err)
}
getResult("Security group get", bytes, securitygroup.RecordSecurityGroup{}, t)
getResult("Security group get", bytes, secgroup.RecordSecurityGroup{}, t)
} else {
t.Errorf("Can not test Security group get because Security group list is empty")
}
@@ -728,20 +728,20 @@ func TestGetListCloudbroker(t *testing.T) {
// Security group
// List
bytes, err = client.CloudBroker().SecurityGroup().ListRaw(context.Background(), securitygroup_cb.ListRequest{})
bytes, err = client.CloudBroker().SecurityGroup().ListRaw(context.Background(), secgroup_cb.ListRequest{})
if err != nil {
t.Error(err)
}
getResult("Security group list", bytes, securitygroup_cb.ListSecurityGroups{}, t)
getResult("Security group list", bytes, secgroup_cb.ListSecurityGroups{}, t)
// Get
listSecurityGroups, _ := client.CloudBroker().SecurityGroup().List(context.Background(), securitygroup_cb.ListRequest{})
listSecurityGroups, _ := client.CloudBroker().SecurityGroup().List(context.Background(), secgroup_cb.ListRequest{})
if len(listSecurityGroups.Data) > 0 {
id := listSecurityGroups.Data[0].ID
bytes, err = client.CloudBroker().SecurityGroup().GetRaw(context.Background(), securitygroup_cb.GetRequest{SecurityGroupID: id})
bytes, err = client.CloudBroker().SecurityGroup().GetRaw(context.Background(), secgroup_cb.GetRequest{SecurityGroupID: id})
if err != nil {
t.Error(err)
}
getResult("Security group get", bytes, securitygroup_cb.RecordSecurityGroup{}, t)
getResult("Security group get", bytes, secgroup_cb.RecordSecurityGroup{}, t)
} else {
t.Errorf("Can not test Security group get because Security group list is empty")
}
@@ -794,20 +794,20 @@ func TestGetListCloudbroker(t *testing.T) {
// Storage policy
// List
bytes, err = client.CloudBroker().StoragePolicy().ListRaw(context.Background(), storagepolicy_cb.ListRequest{})
bytes, err = client.CloudBroker().StPolicy().ListRaw(context.Background(), stpolicy_cb.ListRequest{})
if err != nil {
t.Error(err)
}
getResult("Storage policy list", bytes, storagepolicy_cb.ListStoragePolicies{}, t)
getResult("Storage policy list", bytes, stpolicy_cb.ListStoragePolicies{}, t)
// Get
listStoragePolicies, _ := client.CloudBroker().StoragePolicy().List(context.Background(), storagepolicy_cb.ListRequest{})
listStoragePolicies, _ := client.CloudBroker().StPolicy().List(context.Background(), stpolicy_cb.ListRequest{})
if len(listStoragePolicies.Data) > 0 {
id := listStoragePolicies.Data[0].ID
bytes, err = client.CloudBroker().StoragePolicy().GetRaw(context.Background(), storagepolicy_cb.GetRequest{StoragePolicyID: id})
bytes, err = client.CloudBroker().StPolicy().GetRaw(context.Background(), stpolicy_cb.GetRequest{StoragePolicyID: id})
if err != nil {
t.Error(err)
}
getResult("Storage policy get", bytes, storagepolicy_cb.InfoStoragePolicy{}, t)
getResult("Storage policy get", bytes, stpolicy_cb.InfoStoragePolicy{}, t)
} else {
t.Errorf("Can not test Storage policy get because Storage policy list is empty")
}

View File

@@ -18,10 +18,10 @@ import (
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/pcidevice"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/prometheus"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/rg"
securitygroup "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/security_group"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/secgroup"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/sep"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stack"
storagepolicy "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/storage_policy"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/stpolicy"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/tasks"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/trunk"
"repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudapi/user"
@@ -50,10 +50,10 @@ import (
pcidevice_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/pcidevice"
prometheus_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/prometheus"
rg_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/rg"
securitygroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/security_group"
secgroup_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/secgroup"
sep_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/sep"
stack_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stack"
storagepolicy_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/storage_policy"
stpolicy_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/stpolicy"
tasks_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/tasks"
trunk_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/trunk"
user_cb "repository.basistech.ru/BASIS/decort-golang-sdk/pkg/cloudbroker/user"
@@ -384,13 +384,13 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/rg/removeDefNet": rg.RemoveDefNetRequest{},
// security_group
"/restmachine/cloudapi/security_group/create": securitygroup.CreateRequest{},
"/restmachine/cloudapi/security_group/create_rule": securitygroup.CreateRuleRequest{},
"/restmachine/cloudapi/security_group/delete": securitygroup.DeleteRequest{},
"/restmachine/cloudapi/security_group/delete_rule": securitygroup.DeleteRuleRequest{},
"/restmachine/cloudapi/security_group/get": securitygroup.GetRequest{},
"/restmachine/cloudapi/security_group/list": securitygroup.ListRequest{},
"/restmachine/cloudapi/security_group/update": securitygroup.UpdateRequest{},
"/restmachine/cloudapi/security_group/create": secgroup.CreateRequest{},
"/restmachine/cloudapi/security_group/create_rule": secgroup.CreateRuleRequest{},
"/restmachine/cloudapi/security_group/delete": secgroup.DeleteRequest{},
"/restmachine/cloudapi/security_group/delete_rule": secgroup.DeleteRuleRequest{},
"/restmachine/cloudapi/security_group/get": secgroup.GetRequest{},
"/restmachine/cloudapi/security_group/list": secgroup.ListRequest{},
"/restmachine/cloudapi/security_group/update": secgroup.UpdateRequest{},
// sep
"/restmachine/cloudapi/sep/listAvailableSepAndPools": sep.ListAvailableSEPAndPoolsRequest{},
@@ -402,8 +402,8 @@ func getRequestsMapCloudAPI() map[string]interface{} {
"/restmachine/cloudapi/tasks/list": tasks.ListRequest{},
// storage policy
"/restmachine/cloudapi/storage_policy/get": storagepolicy.GetRequest{},
"/restmachine/cloudapi/storage_policy/list": storagepolicy.ListRequest{},
"/restmachine/cloudapi/storage_policy/get": stpolicy.GetRequest{},
"/restmachine/cloudapi/storage_policy/list": stpolicy.ListRequest{},
// trunk
"/restmachine/cloudapi/trunk/get": trunk.GetRequest{},
@@ -588,6 +588,7 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/compute/migrateStorageAbort": compute_cb.MigrateStorageAbortRequest{},
"/restmachine/cloudbroker/compute/migrateStorageCleanup": compute_cb.MigrateStorageCleanUpRequest{},
"/restmachine/cloudbroker/compute/migrateStorageInfo": compute_cb.MigrateStorageInfoRequest{},
"/restmachine/cloudbroker/compute/migrate_storage_list": compute_cb.MigrateStorageListRequest{},
"/restmachine/cloudbroker/compute/moveToRg": compute_cb.MoveToRGRequest{},
"/restmachine/cloudbroker/compute/netAttach": compute_cb.NetAttachRequest{},
"/restmachine/cloudbroker/compute/netDetach": compute_cb.NetDetachRequest{},
@@ -613,7 +614,9 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/compute/snapshotRollback": compute_cb.SnapshotRollbackRequest{},
"/restmachine/cloudbroker/compute/snapshotUsage": compute_cb.SnapshotUsageRequest{},
"/restmachine/cloudbroker/compute/start": compute_cb.StartRequest{},
"/restmachine/cloudbroker/compute/start_migration_in": compute_cb.StartMigrationINRequest{},
"/restmachine/cloudbroker/compute/stop": compute_cb.StopRequest{},
"/restmachine/cloudbroker/compute/stop_migration_in": compute_cb.StopMigrationINRequest{},
"/restmachine/cloudbroker/compute/tagAdd": compute_cb.TagAddRequest{},
"/restmachine/cloudbroker/compute/tagRemove": compute_cb.TagRemoveRequest{},
"/restmachine/cloudbroker/compute/unpinFromStack": compute_cb.UnpinFromStackRequest{},
@@ -762,7 +765,6 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/image/rename": image_cb.RenameRequest{},
"/restmachine/cloudbroker/image/revokeAccess": image_cb.RevokeAccessRequest{},
"/restmachine/cloudbroker/image/share": image_cb.ShareRequest{},
"/restmachine/cloudbroker/image/updateNodes": image_cb.UpdateNodesRequest{},
// k8ci
"/restmachine/cloudbroker/k8ci/accessAdd": k8ci_cb.AccessAddRequest{},
@@ -838,12 +840,14 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/lb/updateSysctlParams": lb_cb.UpdateSysctParamsRequest{},
// node
"/restmachine/cloudbroker/node/add_ssh_identity": node_cb.AddSSHIdentityRequest{},
"/restmachine/cloudbroker/node/applyIpmiAction": node_cb.ApplyIpmiActionRequest{},
"/restmachine/cloudbroker/node/consumption": node_cb.ConsumptionRequest{},
"/restmachine/cloudbroker/node/decommission": node_cb.DecommissionRequest{},
"/restmachine/cloudbroker/node/enable": node_cb.EnableRequest{},
"/restmachine/cloudbroker/node/enableNodes": node_cb.EnableNodesRequest{},
"/restmachine/cloudbroker/node/get": node_cb.GetRequest{},
"/restmachine/cloudbroker/node/get_ssh_identity": node_cb.GetSSHIdentityRequest{},
"/restmachine/cloudbroker/node/list": node_cb.ListRequest{},
"/restmachine/cloudbroker/node/maintenance": node_cb.MaintenanceRequest{},
"/restmachine/cloudbroker/node/restrict": node_cb.RestrictRequest{},
@@ -914,13 +918,13 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/rg/removeDefNet": rg_cb.RemoveDefNetRequest{},
// security_group
"/restmachine/cloudbroker/security_group/create": securitygroup_cb.CreateRequest{},
"/restmachine/cloudbroker/security_group/create_rule": securitygroup_cb.CreateRuleRequest{},
"/restmachine/cloudbroker/security_group/delete": securitygroup_cb.DeleteRequest{},
"/restmachine/cloudbroker/security_group/delete_rule": securitygroup_cb.DeleteRuleRequest{},
"/restmachine/cloudbroker/security_group/get": securitygroup_cb.GetRequest{},
"/restmachine/cloudbroker/security_group/list": securitygroup_cb.ListRequest{},
"/restmachine/cloudbroker/security_group/update": securitygroup_cb.UpdateRequest{},
"/restmachine/cloudbroker/security_group/create": secgroup_cb.CreateRequest{},
"/restmachine/cloudbroker/security_group/create_rule": secgroup_cb.CreateRuleRequest{},
"/restmachine/cloudbroker/security_group/delete": secgroup_cb.DeleteRequest{},
"/restmachine/cloudbroker/security_group/delete_rule": secgroup_cb.DeleteRuleRequest{},
"/restmachine/cloudbroker/security_group/get": secgroup_cb.GetRequest{},
"/restmachine/cloudbroker/security_group/list": secgroup_cb.ListRequest{},
"/restmachine/cloudbroker/security_group/update": secgroup_cb.UpdateRequest{},
// sep
"/restmachine/cloudbroker/sep/accessGrant": sep_cb.AccessGrantRequest{},
@@ -958,15 +962,15 @@ func getRequestsMapCloudbroker() map[string]interface{} {
"/restmachine/cloudbroker/stack/setMemAllocationRatio": stack_cb.SetMemAllocationRatioRequest{},
// storage_policy
"/restmachine/cloudbroker/storage_policy/get": storagepolicy_cb.GetRequest{},
"/restmachine/cloudbroker/storage_policy/list": storagepolicy_cb.ListRequest{},
"/restmachine/cloudbroker/storage_policy/create": storagepolicy_cb.CreateRequest{},
"/restmachine/cloudbroker/storage_policy/update": storagepolicy_cb.UpdateRequest{},
"/restmachine/cloudbroker/storage_policy/add_pool": storagepolicy_cb.AddPoolRequest{},
"/restmachine/cloudbroker/storage_policy/delete": storagepolicy_cb.DeleteRequest{},
"/restmachine/cloudbroker/storage_policy/disable": storagepolicy_cb.DisableRequest{},
"/restmachine/cloudbroker/storage_policy/enable": storagepolicy_cb.EnableRequest{},
"/restmachine/cloudbroker/storage_policy/delete_pool": storagepolicy_cb.DeletePollRequest{},
"/restmachine/cloudbroker/storage_policy/get": stpolicy_cb.GetRequest{},
"/restmachine/cloudbroker/storage_policy/list": stpolicy_cb.ListRequest{},
"/restmachine/cloudbroker/storage_policy/create": stpolicy_cb.CreateRequest{},
"/restmachine/cloudbroker/storage_policy/update": stpolicy_cb.UpdateRequest{},
"/restmachine/cloudbroker/storage_policy/add_pool": stpolicy_cb.AddPoolRequest{},
"/restmachine/cloudbroker/storage_policy/delete": stpolicy_cb.DeleteRequest{},
"/restmachine/cloudbroker/storage_policy/disable": stpolicy_cb.DisableRequest{},
"/restmachine/cloudbroker/storage_policy/enable": stpolicy_cb.EnableRequest{},
"/restmachine/cloudbroker/storage_policy/delete_pool": stpolicy_cb.DeletePoolRequest{},
// tasks
"/restmachine/cloudbroker/tasks/get": tasks_cb.GetRequest{},

View File

@@ -47,6 +47,7 @@ var DEPRECATED_GROUPS = []string{
"/cloudbroker/compute/affinityGroupCheckStart",
"/cloudbroker/vins/staticRouteAccessGrant",
"/cloudbroker/vins/staticRouteAccessRevoke",
"/restmachine/cloudbroker/image/updateNodes",
}
// getUrlsFromBytes converts bytes to array of urls strings