← Back to branch summary

~blake-rouse/maas/add-osystem-to-node-form-api

~blake-rouse/maas/add-osystem-to-node-form-api

« back to all changes in this revision

Viewing changes to src/provisioningserver/power_schema.py

Committer: Blake Rouse
Date: 2014-05-14 14:39:25 UTC
mfrom: (2296.1.2 3_add-osystem-to-node-migration)
Revision ID: blake.rouse@canonical.com-20140514143925-29h6xl25dvy8vl9k

Merge add-osystem-to-node-form-api.

files added:
etc/maas/templates/power/ucsm.template

src/maasserver/migrations/0077_remove_null_for_bootsourceselection_release.py

src/maasserver/migrations/0078_add_osystem_to_node.py

src/provisioningserver/custom_hardware/tests/test_ucsm.py

src/provisioningserver/custom_hardware/ucsm.py

files removed:
src/maasserver/migrations/0077_add_osystem_to_node.py

files modified:
contrib/preseeds_v2/preseed_master

docs/changelog.rst

docs/installing-ubuntu.rst

etc/maas/templates/power/virsh.template

src/maas/development.py

src/maas/settings.py

src/maasserver/api.py

src/maasserver/forms.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_node.py

src/maasserver/node_action.py

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_node_action.py

src/maasserver/views/combo.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/power_schema.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tasks.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

src/provisioningserver/power_schema.py

242

242

make_json_field('power_pass', "Power password"),

243

243

],

244

244

},

245

{

246

'name': 'ucsm',

247

'description': "Cisco UCS Manager",

248

'fields': [

249

make_json_field('uuid', "Server UUID"),

250

make_json_field('power_address', "URL for XML API"),

251

make_json_field('power_user', "API user"),

252

make_json_field('power_pass', "API password"),

253

],

254

},

245

255

]

Older »