From e3132937e325eb7c84a5daf33367140919ac8adc Mon Sep 17 00:00:00 2001
From: Jonathan Cave <jonathan.cave@canonical.com>
Date: Tue, 20 Aug 2019 17:03:57 +0100
Subject: power-management: remove superfluous power category

---
 units/power-management/category.pxu |  3 ---
 units/power-management/jobs.pxu     | 10 +++++-----
 units/watchdog/jobs.pxu             |  6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 units/power-management/category.pxu

diff --git a/units/power-management/category.pxu b/units/power-management/category.pxu
deleted file mode 100644
index 1487d92..0000000
--- a/units/power-management/category.pxu
+++ /dev/null
@@ -1,3 +0,0 @@
-unit: category
-id: power
-_name: Power and Power Management
diff --git a/units/power-management/jobs.pxu b/units/power-management/jobs.pxu
index 23a3054..17cd323 100644
--- a/units/power-management/jobs.pxu
+++ b/units/power-management/jobs.pxu
@@ -262,7 +262,7 @@ _steps:
 _verification:
  System poweroff successfully
 plugin: manual
-category_id: power
+category_id: com.canonical.plainbox::power-management
 estimated_duration: 300
 
 id: power-management/reboot-manual
@@ -275,11 +275,11 @@ _steps:
 _verification:
      System reboot into system successfully
 plugin: manual
-category_id: power
+category_id: com.canonical.plainbox::power-management
 estimated_duration: 300
 
 id: power-management/warm-reboot
-category_id: power
+category_id: com.canonical.plainbox::power-management
 _summary: Warm reboot
 _description: This tests reboots the system using the `reboot` command
 unit: job
@@ -291,7 +291,7 @@ flags: preserve-locale noreturn autorestart
 estimated_duration: 180.0
 
 id: power-management/cold-reboot
-category_id: power
+category_id: com.canonical.plainbox::power-management
 _summary: Cold reboot
 _description: This tests powers off the system and then powers it on using RTC
 unit: job
@@ -311,7 +311,7 @@ unit: template
 template-resource: model_assertion
 template-unit: job
 plugin: shell
-category_id: power
+category_id: com.canonical.plainbox::power-management
 id: power-management/tickless_idle_{kernel}
 estimated_duration: 1.0
 requires: cpuinfo.platform in ('i386', 'x86_64', 'ppc64el', 'pSeries')
diff --git a/units/watchdog/jobs.pxu b/units/watchdog/jobs.pxu
index f42a4f5..2b5b236 100644
--- a/units/watchdog/jobs.pxu
+++ b/units/watchdog/jobs.pxu
@@ -27,7 +27,7 @@ command:
   echo "systemd watchdog disabled"
   echo "watchdog.service active"
   {% endif -%}
-category_id: power
+category_id: com.canonical.plainbox::power-management
 flags: simple
 
 id: watchdog/trigger-system-reset
@@ -48,7 +48,7 @@ command:
 flags: noreturn preserve-locale
 user: root
 plugin: user-interact-verify
-category_id: power
+category_id: com.canonical.plainbox::power-management
 estimated_duration: 60
 
 id: watchdog/trigger-system-reset-auto
@@ -63,5 +63,5 @@ command:
 flags: preserve-locale noreturn autorestart
 user: root
 plugin: shell
-category_id: power
+category_id: com.canonical.plainbox::power-management
 estimated_duration: 60
-- 
cgit v1.2.3