misty 1.4.0 → 1.5.1

data/test/unit/{auth_test.rb → auth/token_test.rb}

@@ -1,16 +1,15 @@
 require 'test_helper'
 require 'auth_helper'
 
-describe Misty::Auth do
-  describe Misty::AuthV3 do
+describe Misty::Auth::Token do
+  describe 'V3' do
     describe '#new' do
       it 'fails when missing credentials' do
         stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {'x-subject-token'=>'token_data'})
-
         proc do
-          Misty::AuthV3.new({})
-        end.must_raise Misty::Auth::URLError
+          token = Misty::Auth::Token.build({})
+        end.must_raise Misty::Auth::Token::URLError
       end
 
       describe 'using the password method' do
@@ -26,9 +25,10 @@ describe Misty::Auth do
 
             stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}").
-              to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
+              to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data_v3'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data_v3'
           end
 
           it 'authenticates using a project name and a project domain id' do
@@ -43,8 +43,8 @@ describe Misty::Auth do
             stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"project_domain_id\"}}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
-
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
 
           it 'authenticates using a project name and a project domain name' do
@@ -61,7 +61,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"name\":\"project_domain\"}}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
         end
 
@@ -78,7 +79,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
 
           it 'authenticates using a domain name' do
@@ -93,7 +95,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
         end
       end
@@ -111,7 +114,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
 
           it 'authenticates using a project name and a project domain id' do
@@ -126,7 +130,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
         end
 
@@ -142,7 +147,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
 
           it 'authenticates using a domain name' do
@@ -156,7 +162,8 @@ describe Misty::Auth do
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-            Misty::AuthV3.new(auth)
+            token = Misty::Auth::Token.build(auth)
+            token.get.must_equal 'token_data'
           end
         end
       end
@@ -173,13 +180,25 @@ describe Misty::Auth do
         }
       end
 
-      it '#get_token' do
-        stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
-        to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
+      describe '#get' do
+        it 'when token has not expired' do
+          stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+          to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
 
-        auth = Misty::AuthV3.new(authv3_creds)
-        auth.stub :expired?, false do
-          auth.get_token.must_equal 'token_data'
+          token = Misty::Auth::Token.build(authv3_creds)
+          token.stub :expired?, false do
+            token.get.must_equal 'token_data'
+          end
+        end
+
+        it 'when token has expired' do
+          stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+          to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
+
+          token = Misty::Auth::Token.build(authv3_creds)
+          token.stub :expired?, true do
+            token.get.must_equal 'token_data'
+          end
         end
       end
 
@@ -187,29 +206,29 @@ describe Misty::Auth do
         stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
 
-        auth = Misty::AuthV3.new(authv3_creds)
-        auth.catalog.must_equal ['catalog_data']
+        token = Misty::Auth::Token.build(authv3_creds)
+        token.catalog.payload.must_equal ['catalog_data']
       end
 
-      it '#get_url' do
+      it '#get_endpoint_url' do
         stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
         to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {'x-subject-token'=>'token_data'})
 
-        auth = Misty::AuthV3.new(authv3_creds)
-        auth.get_url(%w{identity}, 'regionOne', 'public').must_equal 'http://localhost'
+        token = Misty::Auth::Token.build(authv3_creds)
+        token.catalog.get_endpoint_url(%w(identity), 'regionOne', 'public').must_equal 'http://localhost'
       end
     end
   end
 
-  describe Misty::AuthV2 do
+  describe 'V2' do
     describe '#new' do
       it 'fails when missing credentials' do
         stub_request(:post, 'http://localhost:5000/v2.0/tokens').
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
 
         proc do
-          Misty::AuthV2.new({})
-        end.must_raise Misty::Auth::URLError
+          Misty::Auth::Token.build({})
+        end.must_raise Misty::Auth::Token::URLError
       end
 
       describe 'using the password method' do
@@ -225,7 +244,8 @@ describe Misty::Auth do
             with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantName\":\"tenant\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          Misty::AuthV2.new(auth)
+          token = Misty::Auth::Token.build(auth)
+          token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
         end
 
         it 'authenticates using the tenant id' do
@@ -240,7 +260,8 @@ describe Misty::Auth do
             with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantId\":\"tenant_id\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          Misty::AuthV2.new(auth)
+          token = Misty::Auth::Token.build(auth)
+          token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
         end
       end
 
@@ -256,7 +277,8 @@ describe Misty::Auth do
             with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          Misty::AuthV2.new(auth)
+          token = Misty::Auth::Token.build(auth)
+          token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
         end
 
         it 'authenticates using the tenant id' do
@@ -270,7 +292,7 @@ describe Misty::Auth do
             with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
-          Misty::AuthV2.new(auth)
+          token = Misty::Auth::Token.build(auth)
         end
       end
     end
@@ -285,13 +307,25 @@ describe Misty::Auth do
         }
       end
 
-      it '#get_token' do
-        stub_request(:post, 'http://localhost:5000/v2.0/tokens').
-          to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
+      describe '#get' do
+        it 'when token has not expired' do
+          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+            to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
-        auth = Misty::AuthV2.new(authv2_creds)
-        auth.stub :expired?, false do
-          auth.get_token.must_equal 'token_data'
+          token = Misty::Auth::Token.build(authv2_creds)
+          token.stub :expired?, false do
+            token.get.must_equal 'token_not_expired'
+          end
+        end
+
+        it 'when token has expired' do
+          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+            to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
+
+          token = Misty::Auth::Token.build(authv2_creds)
+          token.stub :expired?, true do
+            token.get.must_equal 'token_expired'
+          end
         end
       end
 
@@ -299,16 +333,16 @@ describe Misty::Auth do
         stub_request(:post, 'http://localhost:5000/v2.0/tokens').
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
-        auth = Misty::AuthV2.new(authv2_creds)
-        auth.catalog.must_equal ['catalog_data']
+        token = Misty::Auth::Token.build(authv2_creds)
+        token.catalog.payload.must_equal ['catalog_data']
       end
 
-      it '#get_url' do
+      it '#get_endpoint_url' do
         stub_request(:post, 'http://localhost:5000/v2.0/tokens').
           to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
-        auth = Misty::AuthV2.new(authv2_creds)
-        auth.get_url(%w{identity}, 'regionOne', 'public').must_equal 'http://localhost'
+        token = Misty::Auth::Token.build(authv2_creds)
+        token.catalog.get_endpoint_url(%w(identity), 'regionOne', 'public').must_equal 'http://localhost'
       end
     end
   end

data/test/unit/cloud/config_test.rb

@@ -43,10 +43,10 @@ describe Misty::Config do
         end.must_raise Misty::Config::InvalidDataError
       end
 
-      it 'with region_id wrong type' do
+      it 'with region wrong type' do
         auth_request
         proc do
-          Misty::Config.new(:auth => auth, :region_id => true)
+          Misty::Config.new(:auth => auth, :region => true)
         end.must_raise Misty::Config::InvalidDataError
       end
 
@@ -67,12 +67,12 @@ describe Misty::Config do
         end
 
         config.log.must_be_kind_of Logger
-        config.auth.must_be_kind_of Misty::AuthV3
+        config.token.must_be_kind_of Misty::Auth::Token::V3
         config.globals[:content_type].must_equal Misty::Config::CONTENT_TYPE
         config.globals[:headers].must_be_kind_of Misty::HTTP::Header
         config.globals[:headers].get.must_equal("Accept"=>"application/json; q=1.0")
         config.globals[:interface].must_equal Misty::Config::INTERFACE
-        config.globals[:region_id].must_equal Misty::Config::REGION_ID
+        config.globals[:region].must_equal Misty::Config::REGION
         config.globals[:ssl_verify_mode].must_equal Misty::Config::SSL_VERIFY_MODE
       end
 
@@ -85,10 +85,11 @@ describe Misty::Config do
           :content_type    => :json,
           :headers         => {'var' => 'value'},
           :interface       => 'admin',
-          :region_id       => 'regionTest',
+          :region          => 'regionTest',
           :ssl_verify_mode => false,
           :log_file        => LOG_FILE_NAME
         )
+
         def config.globals
           @globals
         end
@@ -96,14 +97,14 @@ describe Misty::Config do
         config.globals[:content_type].must_equal :json
         config.globals[:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'var' => 'value')
         config.globals[:interface].must_equal 'admin'
-        config.globals[:region_id].must_equal 'regionTest'
+        config.globals[:region].must_equal 'regionTest'
         config.globals[:ssl_verify_mode].must_equal false
         File.exist?(LOG_FILE_NAME).must_equal true
         File.delete(LOG_FILE_NAME) if File.exist?(LOG_FILE_NAME)
       end
 
-      describe 'service level configurations' do
-        it 'with globals defaults' do
+      describe 'with no global Cloud defined parameters'  do
+        it 'set Service defined parameters' do
           auth_request
           config = Misty::Config.new(
             :auth       => auth,
@@ -111,53 +112,90 @@ describe Misty::Config do
               :content_type    => :json,
               :headers         => {'Service Key' => 'Service Value'},
               :interface       => 'internal',
-              :region_id       => 'region local',
+              :region          => 'region local',
               :ssl_verify_mode => false,
 
               :base_path       => 'base_path_test',
-              :base_url        => '/base.url.com',
+              :endpoint        => 'https://service.example.com:8080',
+              :service_name    => 'service1',
               :version         => 'vtest'
             }
           )
 
-          service_config = config.get_service(:compute)
-          service_config[:config][:content_type].must_equal :json
-          service_config[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Service Key' => 'Service Value')
-          service_config[:config][:interface].must_equal 'internal'
-          service_config[:config][:region_id].must_equal 'region local'
-          service_config[:config][:ssl_verify_mode].must_equal false
-          service_config[:config][:base_path].must_equal 'base_path_test'
-          service_config[:config][:base_url].must_equal '/base.url.com'
-          service_config[:config][:version].must_equal 'vtest'
+          service = config.get_service(:compute)
+          service[:config][:content_type].must_equal :json
+          service[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Service Key' => 'Service Value')
+          service[:config][:interface].must_equal 'internal'
+          service[:config][:region].must_equal 'region local'
+          service[:config][:ssl_verify_mode].must_equal false
+
+          service[:config][:base_path].must_equal 'base_path_test'
+          service[:config][:endpoint].must_equal 'https://service.example.com:8080'
+          service[:config][:service_name].must_equal 'service1'
+          service[:config][:version].must_equal 'vtest'
         end
+      end
 
-        it 'with Cloud level parameters' do
+      describe 'with global Cloud defined parameters' do
+        let(:config) do
           auth_request
-          config = Misty::Config.new(
-            :auth            => auth,
-            :content_type    => :json,
-            :headers         => {'Global Key' => 'Global Value'},
-            :interface       => 'internal',
-            :region_id       => 'region_global',
-            :ssl_verify_mode => false,
-              :networking => {
-                :content_type    => :hash,
-                :headers         => {'Local Key' => 'Local Value'},
-                :interface       => 'admin',
-                :region_id       => 'region_local',
-                :ssl_verify_mode => true
-              }
-          )
+          Misty::Config.new(
+           :auth            => auth,
+           :content_type    => :json,
+           :headers         => {'Global Key' => 'Global Value'},
+           :interface       => 'internal',
+           :region          => 'region_global',
+           :ssl_verify_mode => false,
+           :network => {
+             :content_type    => :hash,
+             :headers         => {'Local Key' => 'Local Value'},
+             :interface       => 'admin',
+             :region          => 'region_local',
+             :ssl_verify_mode => true,
+
+             :base_path       => 'base_path_test',
+             :endpoint        => 'https://service1.example.com:8888',
+             :service_name    => 'service1',
+             :version         => '2.10'
+           })
+        end
+
+        it 'set globals' do
           def config.globals
             @globals
           end
 
-          service_config = config.get_service(:networking)
-          service_config[:config][:content_type].must_equal :hash
-          service_config[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Global Key' => 'Global Value', 'Local Key' => 'Local Value')
-          service_config[:config][:interface].must_equal 'admin'
-          service_config[:config][:region_id].must_equal 'region_local'
-          service_config[:config][:ssl_verify_mode].must_equal true
+          config.globals[:content_type].must_equal :json
+          config.globals[:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Global Key' => 'Global Value')
+          config.globals[:interface].must_equal "internal"
+          config.globals[:region].must_equal "region_global"
+          config.globals[:ssl_verify_mode].must_equal false
+        end
+
+        it 'set Service defined parameters' do
+          network = config.get_service(:network)
+          network[:config][:content_type].must_equal :hash
+          network[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Global Key' => 'Global Value', 'Local Key' => 'Local Value')
+          network[:config][:interface].must_equal 'admin'
+          network[:config][:region].must_equal 'region_local'
+          network[:config][:ssl_verify_mode].must_equal true
+
+          network[:config][:endpoint].must_equal 'https://service1.example.com:8888'
+          network[:config][:service_name].must_equal 'service1'
+          network[:config][:version].must_equal '2.10'
+        end
+
+        it 'set no Service defined parameters' do
+          compute = config.get_service(:compute)
+          compute[:config][:content_type].must_equal :json
+          compute[:config][:headers].get.must_equal('Accept' => 'application/json; q=1.0', 'Global Key' => 'Global Value')
+          compute[:config][:interface].must_equal 'internal'
+          compute[:config][:region].must_equal 'region_global'
+          compute[:config][:ssl_verify_mode].must_equal false
+
+          compute[:config][:endpoint].must_equal nil
+          compute[:config][:service_name].must_equal nil
+          compute[:config][:version].must_equal nil
         end
       end
     end

data/test/unit/cloud/requests_test.rb

@@ -87,7 +87,7 @@ describe Misty::Cloud do
         with(:headers => {'Content-Type'=>'application/json'}).
         to_return(:status => 201, :body => "", :headers => {})
 
-      cloud.networking.create_network(['network', {'name' => 'network1'}]).response.must_be_kind_of Net::HTTPCreated
+      cloud.network.create_network(['network', {'name' => 'network1'}]).response.must_be_kind_of Net::HTTPCreated
     end
 
     it 'sucessful with Hash type data' do
@@ -99,7 +99,7 @@ describe Misty::Cloud do
         with(:headers => {'Content-Type'=>'application/json'}).
         to_return(:status => 201, :body => "", :headers => {})
 
-      cloud.networking.create_network({'network' => {'name' => 'network1'}}).response.must_be_kind_of Net::HTTPCreated
+      cloud.network.create_network({'network' => {'name' => 'network1'}}).response.must_be_kind_of Net::HTTPCreated
     end
 
     it 'sucessful with JSON String data' do
@@ -111,7 +111,7 @@ describe Misty::Cloud do
         with(:headers => {'Content-Type'=>'application/json'}).
         to_return(:status => 201, :body => "", :headers => {})
 
-      cloud.networking.create_network("{\"network\":{\"name\":\"network1\"}}").response.must_be_kind_of Net::HTTPCreated
+      cloud.network.create_network("{\"network\":{\"name\":\"network1\"}}").response.must_be_kind_of Net::HTTPCreated
     end
 
     it 'fails when not enough arguments' do
@@ -156,7 +156,7 @@ describe Misty::Cloud do
         with(:headers => {'Content-Type'=>'application/json'}).
         to_return(:status => 200, :body => "", :headers => {})
 
-      cloud.networking.update_network('network_id', ['network', {'name' => 'network2'}]).response.must_be_kind_of Net::HTTPOK
+      cloud.network.update_network('network_id', ['network', {'name' => 'network2'}]).response.must_be_kind_of Net::HTTPOK
     end
 
     it 'sucessful with Hash type data' do
@@ -168,7 +168,7 @@ describe Misty::Cloud do
         with(:headers => {'Content-Type'=>'application/json'}).
         to_return(:status => 200, :body => "", :headers => {})
 
-      cloud.networking.update_network('network_id', {'network' => {'name' => 'network2'}}).response.must_be_kind_of Net::HTTPOK
+      cloud.network.update_network('network_id', {'network' => {'name' => 'network2'}}).response.must_be_kind_of Net::HTTPOK
     end
 
     it 'sucessful with JSON String data' do
@@ -180,7 +180,7 @@ describe Misty::Cloud do
         with(:headers => {'Content-Type'=>'application/json'}).
         to_return(:status => 200, :body => "", :headers => {})
 
-      cloud.networking.update_network('network_id', "{\"network\":{\"name\":\"network2\"}}").response.must_be_kind_of Net::HTTPOK
+      cloud.network.update_network('network_id', "{\"network\":{\"name\":\"network2\"}}").response.must_be_kind_of Net::HTTPOK
     end
   end
 end