~andreserl/maas/lp1592666

« back to all changes in this revision

Viewing changes to src/provisioningserver/rpc/tests/test_dhcp.py

Committer: LaMont Jones
Date: 2016-04-11 16:23:26 UTC
mfrom: (4900 maas)
mto: This revision was merged to the branch mainline in revision 4924.
Revision ID: lamont@canonical.com-20160411162326-6ycj8l2j66v2o5es

merge trunk

files added:
docs/development/notes

docs/development/notes/check-imports.rst

docs/development/notes/index.rst

docs/development/notes/unhandled-error-in-deferred.rst

docs/media/external-proxy.png

docs/media/no-proxy.png

docs/proxy.rst

src/maasserver/api/regioncontrollers.py

src/maasserver/api/tests/test_regioncontroller.py

src/maasserver/migrations/builtin/maasserver/0049_add_external_dhcp_present_to_vlan.py

src/maasserver/migrations/builtin/maasserver/0050_modify_external_dhcp_on_vlan.py

src/maasserver/migrations/builtin/maasserver/0051_space_fabric_unique.py

src/maasserver/static/css/maas-styles.css

src/maasserver/static/js/angular/controllers/settings.js

src/maasserver/static/js/angular/controllers/tests/test_settings.js

src/maasserver/static/js/angular/factories/dhcpsnippets.js

src/maasserver/static/js/angular/factories/tests/test_dhcpsnippets.js

src/maasserver/static/partials/settings.html

src/maasserver/websockets/handlers/dhcpsnippet.py

src/maasserver/websockets/handlers/tests/test_dhcpsnippet.py

files removed:
src/maasserver/static/css/maas-styles.css

src/provisioningserver/dhcp/probe.py

files modified:
Makefile

README

buildout.cfg

docs/_static/versions.js

docs/about.rst

docs/bootsources.rst

docs/changelog.rst

docs/index.rst

docs/models.rst

docs/releases.rst

docs/sstreams-mirror.rst

src/maascli/actions/boot_resources_create.py

src/maascli/actions/tests/test_boot_resources_create.py

src/maascli/parser.py

src/maasserver/api/devices.py

src/maasserver/api/dhcpsnippets.py

src/maasserver/api/doc_handler.py

src/maasserver/api/files.py

src/maasserver/api/machines.py

src/maasserver/api/nodes.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/results.py

src/maasserver/api/ssh_keys.py

src/maasserver/api/ssl_keys.py

src/maasserver/api/support.py

src/maasserver/api/tags.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_ipranges.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/vlans.py

src/maasserver/bootresources.py

src/maasserver/bootsources.py

src/maasserver/enum.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_dhcpsnippet.py

src/maasserver/migrations/builtin/maasserver/0028_update_default_vlan_on_interface_and_subnet.py

src/maasserver/models/__init__.py

src/maasserver/models/dnsresource.py

src/maasserver/models/domain.py

src/maasserver/models/fabric.py

src/maasserver/models/filesystemgroup.py

src/maasserver/models/interface.py

src/maasserver/models/iprange.py

src/maasserver/models/node.py

src/maasserver/models/signals/interfaces.py

src/maasserver/models/signals/tests/test_interfaces.py

src/maasserver/models/space.py

src/maasserver/models/sshkey.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_bootresourceset.py

src/maasserver/models/tests/test_domain.py

src/maasserver/models/tests/test_fabric.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_iprange.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_space.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_zone.py

src/maasserver/models/vlan.py

src/maasserver/models/zone.py

src/maasserver/rack_controller.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/static/js/angular/controllers/node_details.js

src/maasserver/static/js/angular/controllers/tests/test_node_details.js

src/maasserver/static/js/angular/factories/general.js

src/maasserver/static/js/angular/factories/tests/test_general.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/node-events.html

src/maasserver/static/partials/vlan-details.html

src/maasserver/static/scss/maas-styles.scss

src/maasserver/static/scss/maas/components/_forms.scss

src/maasserver/static/scss/maas/components/_placeholders.scss

src/maasserver/static/scss/maas/components/_tables.scss

src/maasserver/static/scss/maas/layout/_grids.scss

src/maasserver/static/scss/maas/layout/_headers.scss

src/maasserver/templates/maasserver/settings.html

src/maasserver/testing/factory.py

src/maasserver/testing/sampledata.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_dhcpsnippet.py

src/maasserver/tests/test_rack_controller.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/urls_api.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/handlers/tests/test_vlan.py

src/maasserver/websockets/tests/test_protocol.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/ip_addr_results.txt

src/provisioningserver/config.py

src/provisioningserver/dhcp/detect.py

src/provisioningserver/dhcp/omshell.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/dhcp/tests/test_omshell.py

src/provisioningserver/drivers/osystem/tests/test_ubuntu.py

src/provisioningserver/drivers/osystem/ubuntu.py

src/provisioningserver/drivers/power/amt.py

src/provisioningserver/drivers/power/apc.py

src/provisioningserver/drivers/power/dli.py

src/provisioningserver/drivers/power/hmc.py

src/provisioningserver/drivers/power/moonshot.py

src/provisioningserver/drivers/power/mscm.py

src/provisioningserver/drivers/power/tests/test_amt.py

src/provisioningserver/drivers/power/tests/test_apc.py

src/provisioningserver/drivers/power/tests/test_dli.py

src/provisioningserver/drivers/power/tests/test_hmc.py

src/provisioningserver/drivers/power/tests/test_ipmi.py

src/provisioningserver/drivers/power/tests/test_moonshot.py

src/provisioningserver/drivers/power/tests/test_mscm.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/pserv_services/dhcp_probe_service.py

src/provisioningserver/pserv_services/tests/test_dhcp_probe_service.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_dhcp.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/provisioningserver/rpc/tests/test_dhcp.py

411

call(server_address="127.0.0.1", shared_key=server.omapi_key),

412

))

413

414

def test__calls_operations_in_correct_order(self):

414

def test__performs_operations(self):

415

omshell = Mock()

416

self.patch(dhcp, "Omshell").return_value = omshell

417

remove_host = make_host()

422

omshell.remove,

423

MockCallsMatch(

424

call(remove_host["mac"]),

425

call(modify_host["mac"]),

426

425

))

427

426

self.assertThat(

428

427

omshell.create,

429

428

MockCallsMatch(

430

429

call(add_host["ip"], add_host["mac"]),

430

))

431

self.assertThat(

432

omshell.modify,

433

MockCallsMatch(

431

434

call(modify_host["ip"], modify_host["mac"]),

432

435

))

433

436

Older »