From 133c721f02d3e806b1da0927b0f13b84c704b5d3 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Tue, 9 Jul 2019 14:59:19 +0800 Subject: [PATCH 1/2] fix: add default network project privileges --- pkg/cloudcommon/policy/defaults.go | 12 ++++++++++++ pkg/compute/tasks/guest_create_disk_task.go | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkg/cloudcommon/policy/defaults.go b/pkg/cloudcommon/policy/defaults.go index b855724841..39b9ab3ed3 100644 --- a/pkg/cloudcommon/policy/defaults.go +++ b/pkg/cloudcommon/policy/defaults.go @@ -206,6 +206,18 @@ var ( Action: PolicyActionGet, Result: rbacutils.Allow, }, + { + Service: "compute", + Resource: "networks", + Action: PolicyActionGet, + Result: rbacutils.Allow, + }, + { + Service: "compute", + Resource: "networks", + Action: PolicyActionList, + Result: rbacutils.Allow, + }, { Service: "image", Resource: "images", diff --git a/pkg/compute/tasks/guest_create_disk_task.go b/pkg/compute/tasks/guest_create_disk_task.go index 14ad54bdc5..752d69ebf6 100644 --- a/pkg/compute/tasks/guest_create_disk_task.go +++ b/pkg/compute/tasks/guest_create_disk_task.go @@ -19,9 +19,9 @@ import ( "fmt" "time" - "github.com/pkg/errors" "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" From e1eae840c2b820826ebdc8886d479b8625de7c25 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Tue, 9 Jul 2019 17:11:11 +0800 Subject: [PATCH 2/2] add usage debug --- pkg/compute/usages/handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/compute/usages/handler.go b/pkg/compute/usages/handler.go index 9a12f8f816..de57089f4b 100644 --- a/pkg/compute/usages/handler.go +++ b/pkg/compute/usages/handler.go @@ -105,6 +105,7 @@ func rangeObjHandler( httperrors.GeneralServerError(w, err) return } + log.Debugf("%s %s", ownerId, scope) query := getQuery(r) hostTypes := json.GetQueryStringArray(query, "host_type") // resourceTypes := json.GetQueryStringArray(query, "resource_type")