diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-09 00:33:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-09 00:33:34 +0000 |
| commit | 589cf502e6e4f26cc9ab4e262b8b5070b26dd751 (patch) | |
| tree | cd80616814d1b8483a3a78afe4969f1295a29750 /ironic/tests/db | |
| parent | 4fe17d9319a7c03179ae5c23c53968308d85d9f5 (diff) | |
| parent | c879ed2410e96c9c74574861d497bf0d2b1fad7d (diff) | |
| download | ironic-589cf502e6e4f26cc9ab4e262b8b5070b26dd751.tar.gz | |
Merge "Remove nested 'ssh' dict from driver_info"
Diffstat (limited to 'ironic/tests/db')
| -rw-r--r-- | ironic/tests/db/utils.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ironic/tests/db/utils.py b/ironic/tests/db/utils.py index a75459b57..1686d0bf4 100644 --- a/ironic/tests/db/utils.py +++ b/ironic/tests/db/utils.py @@ -34,14 +34,12 @@ ipmi_info = json.dumps( ssh_info = json.dumps( { - 'ssh': { - "address": "1.2.3.4", - "username": "admin", - "password": "fake", - "port": 22, - "virt_type": "vbox", - "key_filename": "/not/real/file", - } + "ssh_address": "1.2.3.4", + "ssh_username": "admin", + "ssh_password": "fake", + "ssh_port": 22, + "ssh_virt_type": "vbox", + "ssh_key_filename": "/not/real/file", }) pxe_info = json.dumps( |