Merge pull request #29 from zhitongLBN/rework_mock_get_network

return network in mock data in stead of creating a new one

Author: Ladas

lib/fog/openstack/network.rb

@@ -182,7 +182,7 @@ def self.data
 
             hash[key] = {
               :networks => {
-                network_id => {
+                network_id                             => {
                   'id'                    => network_id,
                   'name'                  => 'Public',
                   'subnets'               => [subnet_id],
@@ -192,6 +192,15 @@ def self.data
                   'provider_network_type' => 'vlan',
                   'router:external'       => false,
                   'admin_state_up'        => true,
+                },
+                'e624a36d-762b-481f-9b50-4154ceb78bbb' => {
+                  'id'             => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
+                  'name'           => 'network_1',
+                  'subnets'        => ['2e4ec6a4-0150-47f5-8523-e899ac03026e'],
+                  'shared'         => false,
+                  'status'         => 'ACTIVE',
+                  'admin_state_up' => true,
+                  'tenant_id'      => 'f8b26a6032bc47718a7702233ac708b9',
                 }
               },
               :ports => {},

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

@@ -16,19 +16,7 @@ def get_network(network_id)
           response = Excon::Response.new
           if data = self.data[:networks][network_id]
             response.status = 200
-            response.body = {
-              'network' => {
-                'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb',
-                'name' => 'network_1',
-                'subnets' => [
-                  '2e4ec6a4-0150-47f5-8523-e899ac03026e'
-                ],
-                'shared' => false,
-                'status' => 'ACTIVE',
-                'admin_state_up' => true,
-                'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9',
-              }
-            }
+            response.body = {'network' => data}
             response
           else
             raise Fog::Network::OpenStack::NotFound