Typo

genouest · Dec 16, 2021 · 484a193 · 484a193
1 parent 8d7043c
commit 484a193
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/etc/os-vm-expire/policy.json b/etc/os-vm-expire/policy.json
@@ -3,6 +3,7 @@
     "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
     "default": "rule:admin_or_owner",
     "vmexpire:get": "rule:admin_or_owner",
+    "vmexpire:add": "rule:context_is_admin",
     "vmexpire:extend": "rule:admin_or_owner",
     "vmexpire:delete": "rule:context_is_admin"
 }
diff --git a/etc/oslo-config-generator/policy.json.sample b/etc/oslo-config-generator/policy.json.sample
@@ -3,6 +3,7 @@
     "admin_or_owner":  "rule:context_is_admin or is_admin:True or project_id:%(project_id)s",
     "default": "rule:admin_or_owner",
     "vmexpire:get": "rule:admin_or_owner",
+    "vmexpire:add": "rule:context_is_admin",
     "vmexpire:extend": "rule:admin_or_owner",
     "vmexpire:delete": "rule:context_is_admin",
     "vmexclude:get": "rule:admin",

diff --git a/os_vm_expire/common/policies/base.py b/os_vm_expire/common/policies/base.py
@@ -28,6 +28,7 @@
     "admin_or_owner": "rule:context_is_admin or is_admin:True or project_id:%(project_id)s",
     "default": "rule:admin_or_owner",
     "vmexpire:get": "rule:admin_or_owner",
+    "vmexpire:add": "rule:admin",
     "vmexpire:extend": "rule:admin_or_owner",
     "vmexpire:delete": "rule:context_is_admin",
     "vmexclude:get": "rule:admin",

diff --git a/os_vm_expire/model/repositories.py b/os_vm_expire/model/repositories.py
@@ -40,7 +40,8 @@
 from os_vm_expire import i18n as u
 from os_vm_expire.model.migration import commands
 from os_vm_expire.model import models
-from os_vm_expire.queue import get_instance, get_project_domain
+from os_vm_expire.queue.server import get_instance
+from os_vm_expire.queue.server import get_project_domain
 
 LOG = utils.getLogger(__name__)