openstack/ceilometer
Code Issues Proposed changes

The product name Vsphere should be vSphere

Browse Source 
Within the VMware compute driver there are various references to
"Vsphere" when the proper product name should be "vSphere".

TrivialFix

Change-Id: Ic7e51b99cc1c88212b24d22d3adda3d872e12bbf
This commit is contained in:
Eric Brown 2015-07-17 23:07:44 -07:00
parent 36af88fe92
commit 078efd543a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ceilometer/compute/virt/vmware/inspector.py
View File

@ -31,16 +31,16 @@ opt_group = cfg.OptGroup(name='vmware',
OPTS = [ OPTS = [
cfg.StrOpt('host_ip', cfg.StrOpt('host_ip',
default='', default='',
help='IP address of the VMware Vsphere host.'), help='IP address of the VMware vSphere host.'),
cfg.IntOpt('host_port', cfg.IntOpt('host_port',
default=443, default=443,
help='Port of the VMware Vsphere host.'), help='Port of the VMware vSphere host.'),
cfg.StrOpt('host_username', cfg.StrOpt('host_username',
default='', default='',
help='Username of VMware Vsphere.'), help='Username of VMware vSphere.'),
cfg.StrOpt('host_password', cfg.StrOpt('host_password',
default='', default='',
help='Password of VMware Vsphere.', help='Password of VMware vSphere.',
secret=True), secret=True),
cfg.StrOpt('ca_file', cfg.StrOpt('ca_file',
help='CA bundle file to use in verifying the vCenter server ' help='CA bundle file to use in verifying the vCenter server '
@ -53,7 +53,7 @@ OPTS = [
'"ca_file" is set.'), '"ca_file" is set.'),
cfg.IntOpt('api_retry_count', cfg.IntOpt('api_retry_count',
default=10, default=10,
help='Number of times a VMware Vsphere API may be retried.'), help='Number of times a VMware vSphere API may be retried.'),
cfg.FloatOpt('task_poll_interval', cfg.FloatOpt('task_poll_interval',
default=0.5, default=0.5,
help='Sleep time in seconds for polling an ongoing async ' help='Sleep time in seconds for polling an ongoing async '
@ -103,7 +103,7 @@ class VsphereInspector(virt_inspector.Inspector):
vm_moid = self._ops.get_vm_moid(instance.id) vm_moid = self._ops.get_vm_moid(instance.id)
if vm_moid is None: if vm_moid is None:
raise virt_inspector.InstanceNotFoundException( raise virt_inspector.InstanceNotFoundException(
_('VM %s not found in VMware Vsphere') % instance.id) _('VM %s not found in VMware vSphere') % instance.id)
cpu_util_counter_id = self._ops.get_perf_counter_id( cpu_util_counter_id = self._ops.get_perf_counter_id(
VC_AVERAGE_CPU_CONSUMED_CNTR) VC_AVERAGE_CPU_CONSUMED_CNTR)
cpu_util = self._ops.query_vm_aggregate_stats( cpu_util = self._ops.query_vm_aggregate_stats(
@ -120,7 +120,7 @@ class VsphereInspector(virt_inspector.Inspector):
vm_moid = self._ops.get_vm_moid(instance.id) vm_moid = self._ops.get_vm_moid(instance.id)
if not vm_moid: if not vm_moid:
raise virt_inspector.InstanceNotFoundException( raise virt_inspector.InstanceNotFoundException(
_('VM %s not found in VMware Vsphere') % instance.id) _('VM %s not found in VMware vSphere') % instance.id)
vnic_stats = {} vnic_stats = {}
vnic_ids = set() vnic_ids = set()
@ -152,7 +152,7 @@ class VsphereInspector(virt_inspector.Inspector):
vm_moid = self._ops.get_vm_moid(instance.id) vm_moid = self._ops.get_vm_moid(instance.id)
if vm_moid is None: if vm_moid is None:
raise virt_inspector.InstanceNotFoundException( raise virt_inspector.InstanceNotFoundException(
_('VM %s not found in VMware Vsphere') % instance.id) _('VM %s not found in VMware vSphere') % instance.id)
mem_counter_id = self._ops.get_perf_counter_id( mem_counter_id = self._ops.get_perf_counter_id(
VC_AVERAGE_MEMORY_CONSUMED_CNTR) VC_AVERAGE_MEMORY_CONSUMED_CNTR)
memory = self._ops.query_vm_aggregate_stats( memory = self._ops.query_vm_aggregate_stats(
@ -165,7 +165,7 @@ class VsphereInspector(virt_inspector.Inspector):
vm_moid = self._ops.get_vm_moid(instance.id) vm_moid = self._ops.get_vm_moid(instance.id)
if not vm_moid: if not vm_moid:
raise virt_inspector.InstanceNotFoundException( raise virt_inspector.InstanceNotFoundException(
_('VM %s not found in VMware Vsphere') % instance.id) _('VM %s not found in VMware vSphere') % instance.id)
disk_stats = {} disk_stats = {}
disk_ids = set() disk_ids = set()

2
ceilometer/tests/compute/virt/vmware/test_inspector.py
View File

@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
""" """
Tests for VMware Vsphere inspector. Tests for VMware vSphere inspector.
""" """
import mock import mock