Merge pull request #966 from skateman/policy-features-fix

Fixed endpoint feature mapping for policy-related endpoints
ManageIQ · Dec 2, 2020 · d550a30 · d550a30
2 parents 0a2e7be + 6cf5ab9
commit d550a30
Showing 1 changed file with 57 additions and 49 deletions.
diff --git a/config/api.yml b/config/api.yml
@@ -38,45 +38,45 @@
     :klass: Account
   :actions:
     :description: Actions
-    :identifier: action
+    :identifier: miq_action
     :options:
     - :collection
     :verbs: *gpppd
     :klass: MiqAction
     :collection_actions:
       :get:
       - :name: read
-        :identifier: action_show_list
+        :identifier: miq_action_show_list
       :post:
       - :name: query
-        :identifier: action_show_list
+        :identifier: miq_action_show_list
       - :name: create
-        :identifier: action_new
+        :identifier: miq_action_new
       - :name: edit
-        :identifier: action_edit
+        :identifier: miq_action_edit
       - :name: delete
-        :identifier: action_delete
+        :identifier: miq_action_delete
       :delete:
       - :name: delete
-        :identifier: action_delete
+        :identifier: miq_action_delete
     :resource_actions:
       :get:
       - :name: read
-        :identifier: action_show
+        :identifier: miq_action_show
       :post:
       - :name: edit
-        :identifier: action_edit
+        :identifier: miq_action_edit
       - :name: delete
-        :identifier: action_delete
+        :identifier: miq_action_delete
       :patch:
       - :name: edit
-        :identifier: action_edit
+        :identifier: miq_action_edit
       :put:
       - :name: edit
-        :identifier: action_edit
+        :identifier: miq_action_edit
       :delete:
       - :name: delete
-        :identifier: action_delete
+        :identifier: miq_action_delete
   :alert_actions:
     :description: Alert Actions
     :identifier: alert_action
@@ -176,8 +176,8 @@
       - :name: delete
         :identifier: alert_definition_delete
   :alerts:
-    :description: Alerts
-    :identifier: alert
+    :description: Alert Statuses
+    :identifier: alert_status
     :options:
     - :collection
     :verbs: *g
@@ -1445,7 +1445,7 @@
         :identifier: event_streams_show
   :events:
     :description: Events
-    :identifier: event
+    :identifier: miq_event
     :options:
     - :collection
     - :subcollection
@@ -1454,14 +1454,14 @@
     :collection_actions:
       :get:
       - :name: read
-        :identifier: event
+        :identifier: miq_event
       :post:
       - :name: query
-        :identifier: event
+        :identifier: miq_event
     :resource_actions:
       :get:
       - :name: read
-        :identifier: event
+        :identifier: miq_event
   :features:
     :description: Product Features
     :options:
@@ -2395,7 +2395,7 @@
         :identifier: picture_new
   :policies:
     :description: Policies
-    :identifier: policy
+    :identifier: miq_policy
     :options:
     - :collection
     - :subcollection
@@ -2408,28 +2408,28 @@
     :collection_actions:
       :get:
       - :name: read
-        :identifier: policy_view
+        :identifier: miq_policy_view
       :post:
       - :name: query
-        :identifier: policy_view
+        :identifier: miq_policy_view
       - :name: create
-        :identifier: policy_new
+        :identifier: miq_policy_new
       - :name: edit
-        :identifier: policy_edit
+        :identifier: miq_policy_edit
       - :name: delete
-        :identifier: policy_delete
+        :identifier: miq_policy_delete
     :resource_actions:
       :get:
       - :name: read
-        :identifier: policy_view
+        :identifier: miq_policy_view
       :post:
       - :name: edit
-        :identifier: policy_edit
+        :identifier: miq_policy_edit
       - :name: delete
-        :identifier: policy_delete
+        :identifier: miq_policy_delete
       :delete:
       - :name: delete
-        :identifier: policy_delete
+        :identifier: miq_policy_delete
     :subcollection_actions:
       :post:
       - :name: assign
@@ -2442,7 +2442,7 @@
       - :name: resolve
   :policy_actions:
     :description: Actions
-    :identifier: control_explorer
+    :identifier: control
     :options:
     - :collection
     - :subcollection
@@ -2451,17 +2451,17 @@
     :collection_actions:
       :get:
       - :name: read
-        :identifier: control_explorer_view
+        :identifier: miq_action_show_list
       :post:
       - :name: query
-        :identifier: control_explorer_view
+        :identifier: miq_action_show_list
     :resource_actions:
       :get:
       - :name: read
-        :identifier: control_explorer_view
+        :identifier: miq_action_show
   :policy_profiles:
     :description: Policy Profiles
-    :identifier: policy_profile
+    :identifier: miq_policy_set
     :options:
     - :collection
     - :subcollection
@@ -2472,47 +2472,55 @@
     :collection_actions:
       :get:
       - :name: read
-        :identifier: policy_profile_view
+        :identifier: miq_policy_set_view
       :post:
       - :name: query
-        :identifier: policy_profile_view
+        :identifier: miq_policy_set_view
       - :name: create
-        :identifier: profile_new
+        :identifier: miq_policy_set_new
       - :name: edit
-        :identifier: profile_edit
+        :identifier: miq_policy_set_edit
       - :name: delete
-        :identifier: profile_delete
+        :identifier: miq_policy_set_delete
     :resource_actions:
       :get:
       - :name: read
-        :identifier: policy_profile_view
+        :identifier: miq_policy_set_view
       :post:
       - :name: edit
-        :identifier: profile_edit
+        :identifier: miq_policy_set_edit
       - :name: delete
-        :identifier: profile_delete
+        :identifier: miq_policy_set_delete
       :delete:
       - :name: delete
-        :identifier: profile_delete
+        :identifier: miq_policy_set_delete
       :patch:
       - :name: edit
-        :identifier: profile_edit
+        :identifier: miq_policy_set_edit
       :put:
       - :name: edit
-        :identifier: profile_edit
+        :identifier: miq_policy_set_edit
     :policies_subcollection_actions:
       :post:
       - :name: assign
-        :identifier: policy_profile_assign
+        :identifier:
+        - miq_policy_conditions_assignment
+        - miq_policy_events_assignment
       - :name: unassign
-        :identifier: policy_profile_assign
+        :identifier:
+        - miq_policy_conditions_assignment
+        - miq_policy_events_assignment
       - :name: resolve
     :policies_subresource_actions:
       :post:
       - :name: assign
-        :identifier: policy_profile_assign
+        :identifier:
+        - miq_policy_conditions_assignment
+        - miq_policy_events_assignment
       - :name: unassign
-        :identifier: policy_profile_assign
+        :identifier:
+        - miq_policy_conditions_assignment
+        - miq_policy_events_assignment
       - :name: resolve
   :providers:
     :description: Providers