← Back to branch summary

~nttdata/nova/live-migration

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/test_zones.py

  • Committer: Kei Masumoto
  • Date: 2011-03-10 06:23:13 UTC
  • mfrom: (439.1.342 nova)
  • Revision ID: masumotok@nttdata.co.jp-20110310062313-4q06igbisscjy8nq
merged to trunk rev781

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/test_zones.py
86
86
 
87
87
    def test_get_zone_list(self):
88
88
        req = webob.Request.blank('/v1.0/zones')
 
89
        req.headers["Content-Type"] = "application/json"
89
90
        res = req.get_response(fakes.wsgi_app())
90
 
        res_dict = json.loads(res.body)
91
91
 
92
92
        self.assertEqual(res.status_int, 200)
 
93
        res_dict = json.loads(res.body)
93
94
        self.assertEqual(len(res_dict['zones']), 2)
94
95
 
95
96
    def test_get_zone_by_id(self):
96
97
        req = webob.Request.blank('/v1.0/zones/1')
 
98
        req.headers["Content-Type"] = "application/json"
97
99
        res = req.get_response(fakes.wsgi_app())
 
100
 
 
101
        self.assertEqual(res.status_int, 200)
98
102
        res_dict = json.loads(res.body)
99
 
 
100
103
        self.assertEqual(res_dict['zone']['id'], 1)
101
104
        self.assertEqual(res_dict['zone']['api_url'], 'http://foo.com')
102
105
        self.assertFalse('password' in res_dict['zone'])
103
 
        self.assertEqual(res.status_int, 200)
104
106
 
105
107
    def test_zone_delete(self):
106
108
        req = webob.Request.blank('/v1.0/zones/1')
 
109
        req.headers["Content-Type"] = "application/json"
107
110
        res = req.get_response(fakes.wsgi_app())
108
111
 
109
112
        self.assertEqual(res.status_int, 200)
112
115
        body = dict(zone=dict(api_url='http://blah.zoo', username='fred',
113
116
                        password='fubar'))
114
117
        req = webob.Request.blank('/v1.0/zones')
 
118
        req.headers["Content-Type"] = "application/json"
115
119
        req.method = 'POST'
116
120
        req.body = json.dumps(body)
117
121
 
118
122
        res = req.get_response(fakes.wsgi_app())
 
123
 
 
124
        self.assertEqual(res.status_int, 200)
119
125
        res_dict = json.loads(res.body)
120
 
 
121
 
        self.assertEqual(res.status_int, 200)
122
126
        self.assertEqual(res_dict['zone']['id'], 1)
123
127
        self.assertEqual(res_dict['zone']['api_url'], 'http://blah.zoo')
124
128
        self.assertFalse('username' in res_dict['zone'])
126
130
    def test_zone_update(self):
127
131
        body = dict(zone=dict(username='zeb', password='sneaky'))
128
132
        req = webob.Request.blank('/v1.0/zones/1')
 
133
        req.headers["Content-Type"] = "application/json"
129
134
        req.method = 'PUT'
130
135
        req.body = json.dumps(body)
131
136
 
132
137
        res = req.get_response(fakes.wsgi_app())
 
138
 
 
139
        self.assertEqual(res.status_int, 200)
133
140
        res_dict = json.loads(res.body)
134
 
 
135
 
        self.assertEqual(res.status_int, 200)
136
141
        self.assertEqual(res_dict['zone']['id'], 1)
137
142
        self.assertEqual(res_dict['zone']['api_url'], 'http://foo.com')
138
143
        self.assertFalse('username' in res_dict['zone'])