← Back to branch summary

~ubuntu-branches/ubuntu/saucy/maas/saucy-proposed

~ubuntu-branches/ubuntu/saucy/maas/saucy-proposed

« back to all changes in this revision

Viewing changes to src/maasserver/tests/test_api_node.py

Committer: Package Import Robot
Author(s): Andres Rodriguez
Date: 2013-10-04 12:33:05 UTC
mfrom: (1.2.16)
Revision ID: package-import@ubuntu.com-20131004123305-pu2rr8xhnl47m53n

Tags: 1.4+bzr1693+dfsg-0ubuntu1

https://launchpad.net/bugs/1218526

https://launchpad.net/bugs/1237364

https://launchpad.net/bugs/1236544

https://launchpad.net/bugs/1236544

https://launchpad.net/bugs/1236572

https://launchpad.net/bugs/1236786

* New Upstream Release (LP: #1218526)
  - This new upstream release contains fixes and improvements of the
    features approved by the FFe above.
  - Fixes commissioning failure on Saucy with 'Failed Test' (LP: #1237364)
  - Fixes access of static images over http  (LP: #1236544)
* d/maas-cluster-controller.postinst: a2enmod version module (LP: #1236544)
* d/control: Bump depends on python-django to 1.4. (LP: #1236572)
* d/maas-dhcp.postinst: Fail gracefully if apparmor_parser fails, allowing
  to install maas-dhcp during an ISO install. (LP: #1236786)

files added:
CHANGELOG

docs/changelog.rst

etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect_tool.py

etc/maas/templates/commissioning-user-data/snippets/maas_moonshot_autodetect.py

etc/maas/templates/power/moonshot.template

src/maasserver/migrations/0057_remove_hardware_details.py

src/maasserver/models/nodeprobeddetails.py

src/maasserver/models/tests/test_nodeprobeddetails.py

src/maastesting/tests/test_package.py

src/provisioningserver/import_images/config.py

src/provisioningserver/import_images/tests/test_config.py

files removed:
etc/maas/import_ephemerals

scripts/maas-import-ephemerals.py

files modified:
.pc/02-pserv-config.patch/etc/maas/pserv.yaml

README

contrib/maas-cluster-http.conf

contrib/preseeds_v2/enlist_userdata

contrib/wsgi.py

debian/changelog

debian/control

debian/maas-cluster-controller.install

debian/maas-cluster-controller.postinst

debian/maas-dhcp.postinst

docs/_templates/ubuntu1210/layout.html

docs/_templates/ubuntu1210/theme.conf

docs/development/tagging.rst

docs/index.rst

etc/celeryconfig.py

etc/celeryconfig_cluster.py

etc/celeryconfig_common.py

etc/democeleryconfig.py

etc/democeleryconfig_cluster.py

etc/democeleryconfig_common.py

etc/maas/import_pxe_files

etc/maas/pserv.yaml

etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

etc/maas/templates/commissioning-user-data/snippets/maas_signal.py

etc/maas/templates/commissioning-user-data/user_data.template

scripts/maas-import-ephemerals

setup.py

src/apiclient/creds.py

src/apiclient/encode_json.py

src/apiclient/maas_client.py

src/apiclient/multipart.py

src/apiclient/testing/credentials.py

src/apiclient/testing/django.py

src/apiclient/testing/django_client_proxy.py

src/apiclient/tests/test_creds.py

src/apiclient/tests/test_encode_json.py

src/apiclient/tests/test_maas_client.py

src/apiclient/tests/test_multipart.py

src/apiclient/tests/test_utils.py

src/apiclient/utils.py

src/maas/__init__.py

src/maas/demo.py

src/maas/development.py

src/maas/settings.py

src/maas/tests/test_maas.py

src/maas/urls.py

src/maascli/__init__.py

src/maascli/__main__.py

src/maascli/api.py

src/maascli/auth.py

src/maascli/cli.py

src/maascli/command.py

src/maascli/config.py

src/maascli/parser.py

src/maascli/profile.py

src/maascli/testing/config.py

src/maascli/tests/test_api.py

src/maascli/tests/test_auth.py

src/maascli/tests/test_cli.py

src/maascli/tests/test_config.py

src/maascli/tests/test_integration.py

src/maascli/tests/test_parser.py

src/maascli/tests/test_profile.py

src/maascli/tests/test_utils.py

src/maascli/utils.py

src/maasserver/__init__.py

src/maasserver/api.py

src/maasserver/api_auth.py

src/maasserver/api_support.py

src/maasserver/api_utils.py

src/maasserver/apidoc.py

src/maasserver/components.py

src/maasserver/compose_preseed.py

src/maasserver/config_forms.py

src/maasserver/context_processors.py

src/maasserver/dhcp.py

src/maasserver/dhcp_connect.py

src/maasserver/dns.py

src/maasserver/dns_connect.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/json.py

src/maasserver/maasavahi.py

src/maasserver/management/commands/apikey.py

src/maasserver/management/commands/clearcache.py

src/maasserver/management/commands/createadmin.py

src/maasserver/management/commands/dbshell.py

src/maasserver/management/commands/generate_api_doc.py

src/maasserver/management/commands/get_named_conf.py

src/maasserver/management/commands/runserver.py

src/maasserver/management/commands/set_up_dns.py

src/maasserver/management/commands/write_dns_config.py

src/maasserver/messages.py

src/maasserver/middleware.py

src/maasserver/migrations/0001_initial.py

src/maasserver/migrations/0002_macaddress_unique.py

src/maasserver/migrations/0016_node_nodegroup_not_null.py

src/maasserver/migrations/0052_add_node_storage.py

src/maasserver/models/__init__.py

src/maasserver/models/bootimage.py

src/maasserver/models/cleansave.py

src/maasserver/models/component_error.py

src/maasserver/models/config.py

src/maasserver/models/dhcplease.py

src/maasserver/models/downloadprogress.py

src/maasserver/models/filestorage.py

src/maasserver/models/macaddress.py

src/maasserver/models/managers.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/sshkey.py

src/maasserver/models/tag.py

src/maasserver/models/tests/test_bootimage.py

src/maasserver/models/tests/test_components.py

src/maasserver/models/tests/test_config.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_downloadprogress.py

src/maasserver/models/tests/test_filestorage.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_managers.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/models/tests/test_sshkey.py

src/maasserver/models/tests/test_tag.py

src/maasserver/models/tests/test_timestampedmodel.py

src/maasserver/models/tests/test_user.py

src/maasserver/models/tests/test_userprofile.py

src/maasserver/models/timestampedmodel.py

src/maasserver/models/user.py

src/maasserver/models/userprofile.py

src/maasserver/node_action.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/populate_tags.py

src/maasserver/power_parameters.py

src/maasserver/preseed.py

src/maasserver/rabbit.py

src/maasserver/refresh_worker.py

src/maasserver/sequence.py

src/maasserver/server_address.py

src/maasserver/signals.py

src/maasserver/start_up.py

src/maasserver/support/pertenant/migration.py

src/maasserver/support/pertenant/tests/test_migration.py

src/maasserver/support/pertenant/tests/test_utils.py

src/maasserver/support/pertenant/utils.py

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templatetags/field_type.py

src/maasserver/testing/__init__.py

src/maasserver/testing/api.py

src/maasserver/testing/database.py

src/maasserver/testing/db_migrations.py

src/maasserver/testing/factory.py

src/maasserver/testing/oauthclient.py

src/maasserver/testing/rabbit.py

src/maasserver/testing/testcase.py

src/maasserver/testing/tests/models.py

src/maasserver/testing/tests/test_db_migrations.py

src/maasserver/testing/tests/test_factory.py

src/maasserver/testing/tests/test_module.py

src/maasserver/testing/tests/test_rabbit.py

src/maasserver/tests/__init__.py

src/maasserver/tests/models.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_commissioning.py

src/maasserver/tests/test_api_describe.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_filestorage.py

src/maasserver/tests/test_api_macaddress.py

src/maasserver/tests/test_api_mechanism.py

src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_api_register.py

src/maasserver/tests/test_api_tag.py

src/maasserver/tests/test_api_utils.py

src/maasserver/tests/test_apidoc.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_commands_get_named_conf.py

src/maasserver/tests/test_commands_set_up_dns.py

src/maasserver/tests/test_commands_write_dns_config.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_config_forms.py

src/maasserver/tests/test_configuration.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_dns.py

src/maasserver/tests/test_exceptions.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_forms_settings.py

src/maasserver/tests/test_js.py

src/maasserver/tests/test_maasavahi.py

src/maasserver/tests/test_messages.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_migrations.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_power_parameters.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_rabbit.py

src/maasserver/tests/test_refresh_worker.py

src/maasserver/tests/test_runserver.py

src/maasserver/tests/test_sequence.py

src/maasserver/tests/test_server_address.py

src/maasserver/tests/test_signals.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_views.py

src/maasserver/tests/test_views_account.py

src/maasserver/tests/test_views_combo.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/tests/test_views_prefs.py

src/maasserver/tests/test_views_settings.py

src/maasserver/tests/test_views_settings_clusters.py

src/maasserver/tests/test_views_settings_commissioning_scripts.py

src/maasserver/tests/test_views_tags.py

src/maasserver/tests/test_worker_user.py

src/maasserver/tests/test_zeroconfservice.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/urls_combo.py

src/maasserver/utils/__init__.py

src/maasserver/utils/jsenums.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_jsenums.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_utils.py

src/maasserver/views/__init__.py

src/maasserver/views/account.py

src/maasserver/views/combo.py

src/maasserver/views/nodes.py

src/maasserver/views/prefs.py

src/maasserver/views/settings.py

src/maasserver/views/settings_clusters.py

src/maasserver/views/settings_commissioning_scripts.py

src/maasserver/views/tags.py

src/maasserver/worker_user.py

src/maasserver/zeroconfservice.py

src/maastesting/__init__.py

src/maastesting/bindfixture.py

src/maastesting/celery.py

src/maastesting/djangotestcase.py

src/maastesting/factory.py

src/maastesting/fakemethod.py

src/maastesting/fixtures.py

src/maastesting/httpd.py

src/maastesting/matchers.py

src/maastesting/runner.py

src/maastesting/scenarios.py

src/maastesting/testcase.py

src/maastesting/tests/__init__.py

src/maastesting/tests/test_bindfixture.py

src/maastesting/tests/test_celery.py

src/maastesting/tests/test_factory.py

src/maastesting/tests/test_fakemethod.py

src/maastesting/tests/test_fixtures.py

src/maastesting/tests/test_httpd.py

src/maastesting/tests/test_matchers.py

src/maastesting/tests/test_scenarios.py

src/maastesting/tests/test_testcase.py

src/maastesting/tests/test_utils.py

src/maastesting/tests/test_yui3.py

src/maastesting/utils.py

src/maastesting/yui3.py

src/metadataserver/__init__.py

src/metadataserver/address.py

src/metadataserver/api.py

src/metadataserver/commissioning/snippets.py

src/metadataserver/commissioning/tests/test_snippets.py

src/metadataserver/commissioning/tests/test_user_data.py

src/metadataserver/commissioning/user_data.py

src/metadataserver/enum.py

src/metadataserver/fields.py

src/metadataserver/middleware.py

src/metadataserver/migrations/0001_initial.py

src/metadataserver/migrations/0003_populate_hardware_details.py

src/metadataserver/models/__init__.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/nodecommissionresult.py

src/metadataserver/models/nodekey.py

src/metadataserver/models/nodeuserdata.py

src/metadataserver/models/tests/test_commissioningscript.py

src/metadataserver/models/tests/test_nodecommissionresult.py

src/metadataserver/models/tests/test_nodekey.py

src/metadataserver/models/tests/test_nodeuserdata.py

src/metadataserver/nodeinituser.py

src/metadataserver/tests/models.py

src/metadataserver/tests/test_address.py

src/metadataserver/tests/test_api.py

src/metadataserver/tests/test_fields.py

src/metadataserver/tests/test_migrations.py

src/metadataserver/tests/test_nodeinituser.py

src/metadataserver/urls.py

src/provisioningserver/__main__.py

src/provisioningserver/amqpclient.py

src/provisioningserver/auth.py

src/provisioningserver/boot_images.py

src/provisioningserver/cache.py

src/provisioningserver/cluster_config.py

src/provisioningserver/config.py

src/provisioningserver/customize_config.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/leases_parser.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_leases.py

src/provisioningserver/dhcp/tests/test_leases_parser.py

src/provisioningserver/dhcp/tests/test_writer.py

src/provisioningserver/dhcp/writer.py

src/provisioningserver/dns/config.py

src/provisioningserver/dns/tests/test_config.py

src/provisioningserver/dns/tests/test_utils.py

src/provisioningserver/dns/utils.py

src/provisioningserver/enum.py

src/provisioningserver/import_images/ephemerals_script.py

src/provisioningserver/import_images/tests/test_ephemerals_script.py

src/provisioningserver/import_images/tests/test_tgt.py

src/provisioningserver/import_images/tgt.py

src/provisioningserver/initialize_cache.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/network.py

src/provisioningserver/omshell.py

src/provisioningserver/plugin.py

src/provisioningserver/power/poweraction.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/pxe/config.py

src/provisioningserver/pxe/install_bootloader.py

src/provisioningserver/pxe/install_image.py

src/provisioningserver/pxe/tests/test_config.py

src/provisioningserver/pxe/tests/test_install_bootloader.py

src/provisioningserver/pxe/tests/test_install_image.py

src/provisioningserver/pxe/tests/test_tftppath.py

src/provisioningserver/pxe/tftppath.py

src/provisioningserver/services.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tags.py

src/provisioningserver/tasks.py

src/provisioningserver/testing/amqpclient.py

src/provisioningserver/testing/boot_images.py

src/provisioningserver/testing/config.py

src/provisioningserver/testing/fakeapi.py

src/provisioningserver/testing/testcase.py

src/provisioningserver/testing/worker_cache.py

src/provisioningserver/tests/__init__.py

src/provisioningserver/tests/test_amqaclient.py

src/provisioningserver/tests/test_auth.py

src/provisioningserver/tests/test_boot_images.py

src/provisioningserver/tests/test_cache.py

src/provisioningserver/tests/test_cluster_config.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_customize_config.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_maas_import_pxe_files.py

src/provisioningserver/tests/test_network.py

src/provisioningserver/tests/test_omshell.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_services.py

src/provisioningserver/tests/test_start_cluster_controller.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tests/test_utils.py

src/provisioningserver/tftp.py

src/provisioningserver/utils.py

templates/management_command.py

templates/model.py

templates/module.py

templates/script.py

templates/test_module.py

twisted/plugins/maasps.py

utilities/find-imported-module-files

utilities/format-imports

utilities/generate-and-upload-docs

utilities/python_standard_libs.py

utilities/rewrite-future-imports

Show diffs side-by-side

added added

removed removed

src/maasserver/tests/test_api_node.py

9

9

unicode_literals,

10

10

)

11

11

12

str = None

13

12

14

__metaclass__ = type

13

15

__all__ = []

14

16

46

48

MAASServerTestCase,

47

49

)

48

50

from maasserver.utils import map_enum

49

from metadataserver.fields import Bin

50

51

from metadataserver.models import (

51

52

commissioningscript,

52

53

NodeKey,

53

54

NodeUserData,

54

55

)

55

from metadataserver.models.nodecommissionresult import NodeCommissionResult

56

56

from metadataserver.nodeinituser import get_node_init_user

57

57

from provisioningserver.enum import (

58

58

POWER_TYPE,

723

723

class TestGetDetails(APITestCase):

724

724

"""Tests for /api/1.0/nodes/<node>/?op=details."""

725

725

726

def make_lshw_result(self, node, data=b"<lshw-data/>", script_result=0):

727

NodeCommissionResult.objects.store_data(

728

node, commissioningscript.LSHW_OUTPUT_NAME,

729

script_result=script_result, data=Bin(data))

726

def make_lshw_result(self, node, script_result=0):

727

return factory.make_node_commission_result(

728

node=node, name=commissioningscript.LSHW_OUTPUT_NAME,

729

script_result=script_result)

730

730

731

def make_lldp_result(self, node, data=b"<lldp-data/>", script_result=0):

732

NodeCommissionResult.objects.store_data(

733

node, commissioningscript.LLDP_OUTPUT_NAME,

734

script_result=script_result, data=Bin(data))

731

def make_lldp_result(self, node, script_result=0):

732

return factory.make_node_commission_result(

733

node=node, name=commissioningscript.LLDP_OUTPUT_NAME,

734

script_result=script_result)

735

735

736

736

def get_details(self, node):

737

737

url = self.get_uri('nodes/%s/') % node.system_id

748

748

749

749

def test_GET_returns_all_details(self):

750

750

node = factory.make_node()

751

self.make_lshw_result(node)

752

self.make_lldp_result(node)

751

lshw_result = self.make_lshw_result(node)

752

lldp_result = self.make_lldp_result(node)

753

753

self.assertDictEqual(

754

{"lshw": bson.Binary(b"<lshw-data/>"),

755

"lldp": bson.Binary(b"<lldp-data/>")},

754

{"lshw": bson.Binary(lshw_result.data),

755

"lldp": bson.Binary(lldp_result.data)},

756

756

self.get_details(node))

757

757

758

758

def test_GET_returns_only_those_details_that_exist(self):

759

759

node = factory.make_node()

760

self.make_lshw_result(node)

760

lshw_result = self.make_lshw_result(node)

761

761

self.assertDictEqual(

762

{"lshw": bson.Binary(b"<lshw-data/>"),

762

{"lshw": bson.Binary(lshw_result.data),

763

763

"lldp": None},

764

764

self.get_details(node))

765

765

Older »