summaryrefslogtreecommitdiff
path: root/nova/virt
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-03-09 18:41:42 +0000
committerGerrit Code Review <review@openstack.org>2023-03-09 18:41:42 +0000
commit373be3db5b7b058767ddac50ff1367725c932a84 (patch)
treec548600465378abdc07ff0238b83ac0be2de830f /nova/virt
parent8de4377fa0102d29805e6be7b08d8fce7b03b82e (diff)
parent37fa501cacdf4807582b677c92bd61013d477e2a (diff)
downloadnova-373be3db5b7b058767ddac50ff1367725c932a84.tar.gz
Merge "fup for power management series"
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/libvirt/cpu/__init__.py22
-rw-r--r--nova/virt/libvirt/driver.py2
2 files changed, 1 insertions, 23 deletions
diff --git a/nova/virt/libvirt/cpu/__init__.py b/nova/virt/libvirt/cpu/__init__.py
index 4410a4e579..e69de29bb2 100644
--- a/nova/virt/libvirt/cpu/__init__.py
+++ b/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
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 510dfdf38f..73134d8391 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -114,7 +114,7 @@ from nova.virt.image import model as imgmodel
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