fup for power management series

Emptying the cpu init file and directly calling the submodule API.

NOTE(artom) Backporting this makes the whole stack on top of this pass
functional and unit tests without any stable-only modifications.
Otherwise we'd have to refactor nova/virt/libvirt/cpu/__init__.py to
use the new per-driver API objects.

Relates to blueprint libvirt-cpu-state-mgmt

Change-Id: I1299ca4b49743f58bec6f541785dd9fbee0ae9e2
(cherry picked from commit 37fa501)

Author: sbauza

nova/tests/functional/libvirt/test_power_manage.py

@@ -21,7 +21,7 @@
 from nova.tests.fixtures import libvirt as fakelibvirt
 from nova.tests.functional.libvirt import base
 from nova.virt import hardware
-from nova.virt.libvirt import cpu
+from nova.virt.libvirt.cpu import api as cpu_api
 
 
 class PowerManagementTestsBase(base.ServersTestBase):
@@ -73,7 +73,7 @@ def _assert_server_cpus_state(self, server, expected='online'):
 
     def _assert_cpu_set_state(self, cpu_set, expected='online'):
         for i in cpu_set:
-            core = cpu.Core(i)
+            core = cpu_api.Core(i)
             if expected == 'online':
                 self.assertTrue(core.online, f'{i} is not online')
             elif expected == 'offline':
@@ -211,7 +211,7 @@ def test_create(self):
 
     def test_changing_strategy_fails(self):
         # Arbitratly set a core governor strategy to be performance
-        cpu.Core(1).set_high_governor()
+        cpu_api.Core(1).set_high_governor()
         # and then forget about it while changing the strategy.
         self.flags(cpu_power_management_strategy='cpu_state', group='libvirt')
         # This time, this wouldn't be acceptable as some core would have a

nova/virt/libvirt/cpu/__init__.py

@@ -1,22 +0,0 @@
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from nova.virt.libvirt.cpu import api
-
-
-Core = api.Core
-
-
-power_up = api.power_up
-power_down = api.power_down
-validate_all_dedicated_cpus = api.validate_all_dedicated_cpus
-power_down_all_dedicated_cpus = api.power_down_all_dedicated_cpus

nova/virt/libvirt/driver.py

@@ -114,7 +114,7 @@
 from nova.virt import images
 from nova.virt.libvirt import blockinfo
 from nova.virt.libvirt import config as vconfig
-from nova.virt.libvirt import cpu as libvirt_cpu
+from nova.virt.libvirt.cpu import api as libvirt_cpu
 from nova.virt.libvirt import designer
 from nova.virt.libvirt import event as libvirtevent
 from nova.virt.libvirt import guest as libvirt_guest