diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 16:08:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 16:08:24 +0000 |
| commit | b9ee4e43dd0c5b76ea7e3e0084979b10d7a8126d (patch) | |
| tree | 208cfa9ca2a6202b9cbcbf7f423538ddff92a420 | |
| parent | 416d127a45e365a2403ee91a836302bb20fc7c09 (diff) | |
| parent | 7a3fe43c91f12bf8cc956c70284c029ac7cf7961 (diff) | |
| download | ceilometer-proposed/kilo.tar.gz | |
Merge "Use oslo_vmware instead of deprecated oslo.vmware"2015.1.0rc1proposed/kilo
4 files changed, 4 insertions, 4 deletions
diff --git a/ceilometer/compute/virt/vmware/inspector.py b/ceilometer/compute/virt/vmware/inspector.py index 0c734441..d6a57deb 100644 --- a/ceilometer/compute/virt/vmware/inspector.py +++ b/ceilometer/compute/virt/vmware/inspector.py @@ -15,9 +15,9 @@ """Implementation of Inspector abstraction for VMware vSphere""" -from oslo.vmware import api from oslo_config import cfg from oslo_utils import units +from oslo_vmware import api from ceilometer.compute.virt import inspector as virt_inspector from ceilometer.compute.virt.vmware import vsphere_operations diff --git a/ceilometer/compute/virt/vmware/vsphere_operations.py b/ceilometer/compute/virt/vmware/vsphere_operations.py index ed5c2e02..16b92b8b 100644 --- a/ceilometer/compute/virt/vmware/vsphere_operations.py +++ b/ceilometer/compute/virt/vmware/vsphere_operations.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.vmware import vim_util +from oslo_vmware import vim_util PERF_MANAGER_TYPE = "PerformanceManager" diff --git a/ceilometer/tests/compute/virt/vmware/test_inspector.py b/ceilometer/tests/compute/virt/vmware/test_inspector.py index 7461e8f6..880764bb 100644 --- a/ceilometer/tests/compute/virt/vmware/test_inspector.py +++ b/ceilometer/tests/compute/virt/vmware/test_inspector.py @@ -17,7 +17,7 @@ Tests for VMware Vsphere inspector. """ import mock -from oslo.vmware import api +from oslo_vmware import api from oslotest import base from ceilometer.compute.virt import inspector as virt_inspector diff --git a/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py b/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py index 50076267..1d7ba148 100644 --- a/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py +++ b/ceilometer/tests/compute/virt/vmware/test_vsphere_operations.py @@ -14,7 +14,7 @@ # under the License. import mock -from oslo.vmware import api +from oslo_vmware import api from oslotest import base from ceilometer.compute.virt.vmware import vsphere_operations |