← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty

« back to all changes in this revision

Viewing changes to heat/tests/v1_1/fakes.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-09-08 21:51:19 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130908215119-r939tu4aumqgdrkx
Tags: 2013.2~b3-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/control: Add python-netaddr as build-dep.
* debian/heat-common.install: Remove heat-boto and associated man-page
* debian/heat-common.install: Remove heat-cfn and associated man-page
* debian/heat-common.install: Remove heat-watch and associated man-page
* debian/patches/fix-sqlalchemy-0.8.patch: Dropped

[ Adam Gandelman ]
* debian/patches/default-kombu.patch: Dropped.
* debian/patches/default-sqlite.patch: Refreshed.
* debian/*.install, rules: Install heat.conf.sample as common
  config file in heat-common. Drop other per-package configs, they
  are no longer used.
* debian/rules: Clean pbr .egg from build dir if it exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/v1_1/fakes.py
121
121
    def get_servers_detail(self, **kw):
122
122
        return (200, {"servers": [{"id": 1234,
123
123
                                   "name": "sample-server",
 
124
                                   "OS-EXT-SRV-ATTR:instance_name":
 
125
                                   "sample-server",
124
126
                                   "image": {"id": 2,
125
127
                                             "name": "sample image"},
126
128
                                   "flavor": {"id": 1,
137
139
                                                             "5.6.7.8"}],
138
140
                                   "private": [{"version": 4,
139
141
                                                "addr": "10.11.12.13"}]},
 
142
                                   "accessIPv4": "",
 
143
                                   "accessIPv6": "",
140
144
                                   "metadata": {"Server Label": "Web Head 1",
141
145
                                                "Image Version": "2.1"}},
142
146
                                  {"id": 5678,
143
147
                                   "name": "sample-server2",
 
148
                                   "OS-EXT-SRV-ATTR:instance_name":
 
149
                                   "sample-server2",
144
150
                                   "image": {"id": 2,
145
151
                                             "name": "sample image"},
146
152
                                   "flavor": {"id": 1,
148
154
                                   "hostId":
149
155
                                   "9e107d9d372bb6826bd81d3542a419d6",
150
156
                                   "status": "ACTIVE",
 
157
                                   "accessIPv4": "192.0.2.0",
 
158
                                   "accessIPv6": "::babe:4317:0A83",
151
159
                                   "addresses": {"public": [{"version": 4,
152
160
                                                             "addr":
153
161
                                                             "4.5.6.7"},
159
167
                                   "metadata": {"Server Label": "DB 1"}},
160
168
                                  {"id": 9101,
161
169
                                   "name": "hard-reboot",
 
170
                                   "OS-EXT-SRV-ATTR:instance_name":
 
171
                                   "hard-reboot",
162
172
                                   "image": {"id": 2,
163
173
                                             "name": "sample image"},
164
174
                                   "flavor": {"id": 1,
166
176
                                   "hostId":
167
177
                                   "9e44d8d435c43dd8d96bb63ed995605f",
168
178
                                   "status": "HARD_REBOOT",
 
179
                                   "accessIPv4": "",
 
180
                                   "accessIPv6": "",
169
181
                                   "addresses": {"public": [{"version": 4,
170
182
                                                             "addr":
171
183
                                                             "172.17.1.2"},
177
189
                                   "metadata": {"Server Label": "DB 1"}},
178
190
                                  {"id": 9102,
179
191
                                   "name": "server-with-no-ip",
 
192
                                   "OS-EXT-SRV-ATTR:instance_name":
 
193
                                   "server-with-no-ip",
180
194
                                   "image": {"id": 2,
181
195
                                             "name": "sample image"},
182
196
                                   "flavor": {"id": 1,
184
198
                                   "hostId":
185
199
                                   "c1365ba78c624df9b2ff446515a682f5",
186
200
                                   "status": "ACTIVE",
 
201
                                   "accessIPv4": "",
 
202
                                   "accessIPv6": "",
187
203
                                   "addresses": {
188
204
                                       "empty_net": []},
189
205
                                   "metadata": {"Server Label": "DB 1"}},
190
206
                                  {"id": 9999,
191
207
                                   "name": "sample-server3",
 
208
                                   "OS-EXT-SRV-ATTR:instance_name":
 
209
                                   "sample-server3",
192
210
                                   "image": {"id": 3,
193
211
                                             "name": "sample image"},
194
212
                                   "flavor": {"id": 3,
196
214
                                   "hostId":
197
215
                                   "9e107d9d372bb6826bd81d3542a419d6",
198
216
                                   "status": "ACTIVE",
 
217
                                   "accessIPv4": "",
 
218
                                   "accessIPv6": "",
199
219
                                   "addresses": {
200
220
                                   "public": [{"version": 4,
201
221
                                               "addr": "4.5.6.7"},