Skip to content

Commit 66188bf

Browse files
committed
return network in mock data in stead of creating a new one
1 parent 643f73c commit 66188bf

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

lib/fog/openstack/network.rb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def self.data
146146

147147
hash[key] = {
148148
:networks => {
149-
network_id => {
149+
network_id => {
150150
'id' => network_id,
151151
'name' => 'Public',
152152
'subnets' => [subnet_id],
@@ -156,6 +156,15 @@ def self.data
156156
'provider_network_type' => 'vlan',
157157
'router:external' => false,
158158
'admin_state_up' => true,
159+
},
160+
'e624a36d-762b-481f-9b50-4154ceb78bbb' => {
161+
'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
162+
'name' => 'network_1',
163+
'subnets' => ['2e4ec6a4-0150-47f5-8523-e899ac03026e'],
164+
'shared' => false,
165+
'status' => 'ACTIVE',
166+
'admin_state_up' => true,
167+
'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
159168
}
160169
},
161170
:ports => {},

lib/fog/openstack/requests/network/get_network.rb

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,7 @@ def get_network(network_id)
1616
response = Excon::Response.new
1717
if data = self.data[:networks][network_id]
1818
response.status = 200
19-
response.body = {
20-
'network' => {
21-
'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
22-
'name' => 'network_1',
23-
'subnets' => [
24-
'2e4ec6a4-0150-47f5-8523-e899ac03026e'
25-
],
26-
'shared' => false,
27-
'status' => 'ACTIVE',
28-
'admin_state_up' => true,
29-
'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
30-
}
31-
}
19+
response.body = {'network' => data}
3220
response
3321
else
3422
raise Fog::Network::OpenStack::NotFound

0 commit comments

Comments
 (0)