diff --git a/doc/source/conf.py b/doc/source/conf.py new file mode 100644 index 00000000..d2f905d3 --- /dev/null +++ b/doc/source/conf.py @@ -0,0 +1,259 @@ +# -*- coding: utf-8 -*- +# +# nova-powervm documentation build configuration file, created by +# sphinx-quickstart on Tue Feb 3 09:06:25 2015. +# +# This file is execfile()d with the current directory set to its +# containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +import sys +import os + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +#sys.path.insert(0, os.path.abspath('.')) + +# -- General configuration ------------------------------------------------ + +# If your documentation needs a minimal Sphinx version, state it here. +#needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix of source filenames. +source_suffix = '.rst' + +# The encoding of source files. +#source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'nova-powervm' +copyright = u'2015, Kyle Henderson, Drew Thorstensen' + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = '0.1.0' +# The full version, including alpha/beta/rc tags. +release = '0.1.0' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +#language = None + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +#today = '' +# Else, today_fmt is used as the format for a strftime call. +#today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +exclude_patterns = ['_build'] + +# The reST default role (used for this markup: `text`) to use for all +# documents. +#default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +#add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +#add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +#show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +#modindex_common_prefix = [] + +# If true, keep warnings as "system message" paragraphs in the built documents. +#keep_warnings = False + + +# -- Options for HTML output ---------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +#html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +#html_theme_path = [] + +# The name for this set of Sphinx documents. If None, it defaults to +# " v documentation". +#html_title = None + +# A shorter title for the navigation bar. Default is the same as html_title. +#html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +#html_logo = None + +# The name of an image file (within the static path) to use as favicon of the +# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +#html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# Add any extra paths that contain custom files (such as robots.txt or +# .htaccess) here, relative to this directory. These files are copied +# directly to the root of the documentation. +#html_extra_path = [] + +# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, +# using the given strftime format. +#html_last_updated_fmt = '%b %d, %Y' + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +#html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +#html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +#html_additional_pages = {} + +# If false, no module index is generated. +#html_domain_indices = True + +# If false, no index is generated. +#html_use_index = True + +# If true, the index is split into individual pages for each letter. +#html_split_index = False + +# If true, links to the reST sources are added to the pages. +#html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +#html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +#html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +#html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +#html_file_suffix = None + +# Output file base name for HTML help builder. +htmlhelp_basename = 'nova-powervmdoc' + + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + #'papersize': 'letterpaper', + + # The font size ('10pt', '11pt' or '12pt'). + #'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + #'preamble': '', + } + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_documents = [ + ('index', 'nova-powervm.tex', u'nova-powervm Documentation', + u'Kyle Henderson, Drew Thorstensen', 'manual'), + ] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +#latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +#latex_use_parts = False + +# If true, show page references after internal links. +#latex_show_pagerefs = False + +# If true, show URL addresses after external links. +#latex_show_urls = False + +# Documents to append as an appendix to all manuals. +#latex_appendices = [] + +# If false, no module index is generated. +#latex_domain_indices = True + + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + ('index', 'nova-powervm', u'nova-powervm Documentation', + [u'Kyle Henderson, Drew Thorstensen'], 1) + ] + +# If true, show URL addresses after external links. +#man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + ('index', 'nova-powervm', u'nova-powervm Documentation', + u'Kyle Henderson, Drew Thorstensen', 'nova-powervm', 'One line description of project.', + 'Miscellaneous'), + ] + +# Documents to append as an appendix to all manuals. +#texinfo_appendices = [] + +# If false, no module index is generated. +#texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +#texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +#texinfo_no_detailmenu = False + diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst new file mode 100644 index 00000000..ac7b6bcf --- /dev/null +++ b/doc/source/contributing.rst @@ -0,0 +1 @@ +.. include:: ../../CONTRIBUTING.rst diff --git a/doc/source/index.rst b/doc/source/index.rst new file mode 100644 index 00000000..bbef7be1 --- /dev/null +++ b/doc/source/index.rst @@ -0,0 +1,18 @@ +Welcome to nova-powervm's documentation! +======================================== + +This project will provide Nova-compatible compute driver for PowerVM based +systems. + +Contents: + +.. toctree:: + :maxdepth: 2 + + + +Indices and tables +================== + +* :ref:`search` + diff --git a/doc/source/readme.rst b/doc/source/readme.rst new file mode 100644 index 00000000..a6210d3d --- /dev/null +++ b/doc/source/readme.rst @@ -0,0 +1 @@ +.. include:: ../../README.rst diff --git a/nova_powervm/tests/virt/powervm/__init__.py b/nova_powervm/tests/virt/powervm/__init__.py index f177bd0e..daf3ba0e 100644 --- a/nova_powervm/tests/virt/powervm/__init__.py +++ b/nova_powervm/tests/virt/powervm/__init__.py @@ -1,4 +1,3 @@ -# Copyright 2014 IBM Corp. # # All Rights Reserved. # @@ -15,28 +14,28 @@ # under the License. # TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR +from nova.objects import flavor import os import sys -SYS_META = { - 'instance_type_memory_mb': 2048, - 'instance_type_swap': 0, - 'instance_type_vcpu_weight': None, - 'instance_type_root_gb': 1, - 'instance_type_id': 2, - 'instance_type_name': u'm1.small', - 'instance_type_ephemeral_gb': 0, - 'instance_type_rxtx_factor': 1.0, - 'instance_type_flavorid': u'1', - 'instance_type_vcpus': 1 -} + +TEST_FLAVOR = flavor.Flavor(memory_mb=2048, + swap=0, + vcpu_weight=None, + root_gb=1, + id=2, + name=u'm1.small', + ephemeral_gb=0, + rxtx_factor=1.0, + flavorid=u'1', + vcpus=1) TEST_INSTANCE = { 'id': 1, 'uuid': '49629a5c-f4c4-4721-9511-9725786ff2e5', 'display_name': 'Fake Instance', 'instance_type_id': '5', - 'system_metadata': SYS_META + 'flavor': TEST_FLAVOR } # NOTE(mikal): All of this is because if dnspython is present in your diff --git a/nova_powervm/tests/virt/powervm/test_driver.py b/nova_powervm/tests/virt/powervm/test_driver.py index 16d374bc..5f569c58 100644 --- a/nova_powervm/tests/virt/powervm/test_driver.py +++ b/nova_powervm/tests/virt/powervm/test_driver.py @@ -112,13 +112,12 @@ class TestPowerVMDriver(test.TestCase): @mock.patch('nova_powervm.virt.powervm.vm.crt_lpar') @mock.patch('nova_powervm.virt.powervm.vm.UUIDCache') @mock.patch('nova.virt.configdrive.required_by') - @mock.patch('nova.context.get_admin_context') @mock.patch('nova.objects.flavor.Flavor.get_by_id') @mock.patch('nova_powervm.virt.powervm.localdisk.LocalStorage') @mock.patch('pypowervm.jobs.power.power_on') - def test_spawn_ops(self, mock_pwron, mock_disk, mock_get_flv, mock_get_ctx, - mock_cfg_drv, mock_uuidcache, mock_crt, mock_find, - mock_apt, mock_sess): + def test_spawn_ops(self, mock_pwron, mock_disk, mock_get_flv, mock_cfg_drv, + mock_uuidcache, mock_crt, mock_find, mock_apt, + mock_sess): """Validates the PowerVM driver operations.""" drv = driver.PowerVMDriver(fake.FakeVirtAPI()) @@ -153,14 +152,13 @@ class TestPowerVMDriver(test.TestCase): @mock.patch('nova_powervm.virt.powervm.vios.add_vscsi_mapping') @mock.patch('nova_powervm.virt.powervm.vm.UUIDCache') @mock.patch('nova.virt.configdrive.required_by') - @mock.patch('nova.context.get_admin_context') @mock.patch('nova.objects.flavor.Flavor.get_by_id') @mock.patch('nova_powervm.virt.powervm.localdisk.LocalStorage') @mock.patch('pypowervm.jobs.power.power_on') def test_spawn_with_cfg(self, mock_pwron, mock_disk, mock_get_flv, - mock_get_ctx, mock_cfg_drv, mock_val_vopt, - mock_vios_vscsi, mock_uuidcache, mock_cfg_vopt, - mock_crt, mock_find, mock_apt, mock_sess): + mock_cfg_drv, mock_val_vopt, mock_vios_vscsi, + mock_uuidcache, mock_cfg_vopt, mock_crt, mock_find, + mock_apt, mock_sess): """Validates the PowerVM spawn w/ config drive operations.""" drv = driver.PowerVMDriver(fake.FakeVirtAPI()) @@ -193,15 +191,14 @@ class TestPowerVMDriver(test.TestCase): @mock.patch('nova_powervm.virt.powervm.vm.dlt_lpar') @mock.patch('nova_powervm.virt.powervm.vm.UUIDCache') @mock.patch('nova.virt.configdrive.required_by') - @mock.patch('nova.context.get_admin_context') @mock.patch('nova.objects.flavor.Flavor.get_by_id') @mock.patch('nova_powervm.virt.powervm.localdisk.LocalStorage') @mock.patch('pypowervm.jobs.power.power_on') @mock.patch('pypowervm.jobs.power.power_off') def test_spawn_ops_rollback(self, mock_pwroff, mock_pwron, mock_disk, - mock_get_flv, mock_get_ctx, mock_cfg_drv, - mock_uuidcache, mock_dlt, mock_crt, mock_find, - mock_apt, mock_sess): + mock_get_flv, mock_cfg_drv, mock_uuidcache, + mock_dlt, mock_crt, mock_find, mock_apt, + mock_sess): """Validates the PowerVM driver operations. Will do a rollback.""" drv = driver.PowerVMDriver(fake.FakeVirtAPI()) drv.init_host('FakeHost') diff --git a/nova_powervm/virt/powervm/media.py b/nova_powervm/virt/powervm/media.py index f10fd546..11b13bf9 100644 --- a/nova_powervm/virt/powervm/media.py +++ b/nova_powervm/virt/powervm/media.py @@ -153,11 +153,9 @@ class ConfigDrivePowerVM(object): # Now, find the vopt in the vg and remove it from the list vmedia_repo = None - optical_media = None vopt_media = None - for vmedia in vol_grp.get_vmedia_repos(): - optical_media = vmedia.get_optical_media() - for vopt in optical_media: + for vmedia in vol_grp.vmedia_repos: + for vopt in vmedia.optical_media: if vopt.media_name == file_name: vmedia_repo = vmedia vopt_media = vopt @@ -169,8 +167,7 @@ class ConfigDrivePowerVM(object): return # Remove the entry from the wrapper and then do an update - optical_media.remove(vopt_media) - vmedia_repo.set_optical_media(optical_media) + vmedia_repo.optical_media.remove(vopt_media) self.adapter.update(vol_grp._element, vol_grp.etag, vios_w.VIO_ROOT, root_id=self.vios_uuid, child_type=vg.VG_ROOT, child_id=CONF.vopt_media_volume_group) @@ -227,13 +224,11 @@ class ConfigDrivePowerVM(object): vol_grp=CONF.vopt_media_volume_group) # Ensure that there is a virtual optical media repository within it. - vmedia_repos = found_vg.get_vmedia_repos() + vmedia_repos = found_vg.vmedia_repos if len(vmedia_repos) == 0: vopt_repo = vg.crt_vmedia_repo('vopt', str(CONF.vopt_media_rep_size)) - vmedia_repos = [vg.VirtualMediaRepository(vopt_repo)] - # TODO(IBM) This fails because its appending at the end... - found_vg.set_vmedia_repos(vmedia_repos) + found_vg.vmedia_repos = [vg.VirtualMediaRepository(vopt_repo)] self.adapter.update(found_vg._entry.element, resp.headers['etag'], pvmc.VIOS, self.vios_uuid, pvmc.VOL_GROUP, found_vg.uuid)