fog-aliyun 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82062a69285f3c3a240f77d49730e674be34e1a4
-  data.tar.gz: 8054a3818fab3fb5661d45279c88bfd1c3527de3
+  metadata.gz: f7c3f28cba2b2acb17e34f8f00a8ed5577bf6c1e
+  data.tar.gz: 465522578a4c15f6a1c4b043ee48f89c62dd78bd
 SHA512:
-  metadata.gz: '08af5f88a8e2da7ff72366f7fc84f87b135d7d74a1549422fd23cd4c94cdc7ddb778ce2868c351e93d591d1f9a1e9d4219568a4ccda7bda2437c87dd7a020d86'
-  data.tar.gz: 6db1a3348d5f9a1406fa752be842d17ae507ec915d2baaf3e3bfb37d14aace66d8b76927dc3a43f98819c4e59a7d4efc5f3d9050b9bc1e0d50cfd1db60ffa48e
+  metadata.gz: fb70b9d6a7b355632beb07a470c782e2ce53dffd93a9668446648053d24b57b95cd88d5ec262d7dfe34b23be4ed335e08627d9ec9c90292c1dd37b9bd791d71a
+  data.tar.gz: 3f2257c4ecbf8842c547e446d3841c048a7ad057c52c39dd1924c6a52f3f754a9edfe2cc373ca5b2ecdcbbe83d92948e932237c57c91aabd030888e6848e6685

data/fog-aliyun.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'fog-aliyun'
   spec.version       = Fog::Aliyun::VERSION
   spec.authors       = ['Qinsi Deng, Jianxun Li, Jane Han']
-  spec.email         = ['dengqs@dtdream.com']
+  spec.email         = ['dengqinsi@sina.com']
 
   spec.summary       = 'Fog provider for Aliyun Web Services.'
   spec.description   = 'As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support more aliyun services later.'

data/lib/fog/aliyun/compute.rb

@@ -95,7 +95,13 @@ module Fog
       request :list_vswitchs
       request :modify_vpc
       request :modify_vswitch
-
+      request :list_vpn_gateways
+      request :list_vpn_customergateways
+      request :list_vpn_connections
+      request :create_vpn_customergateway
+      request :create_vpn_connection
+      request :delete_vpn_customergateway
+      request :delete_vpn_connection
       # VRouter
       request :list_vrouters
 
@@ -271,13 +277,21 @@ module Fog
           @path   = uri.path
           @port   = uri.port
           @scheme = uri.scheme
-
+          
+          vpcuri = URI.parse("https://vpc.aliyuncs.com")
+          @vpchost   = vpcuri.host
+          @vpcpath   = vpcuri.path
+          @vpcport   = vpcuri.port
+          @vpcscheme = vpcuri.scheme          
+          
           @persistent = options[:persistent] || false
           @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @VPCconnection = Fog::Core::Connection.new("#{@vpcscheme}://#{@vpchost}:#{@vpcport}", @persistent, @connection_options)
         end
 
         def reload
           @connection.reset
+          @VPCconnection.reset
         end
 
         def request(params)
@@ -305,6 +319,31 @@ module Fog
           response
         end
 
+        def VPCrequest(params)
+          begin
+            response = @VPCconnection.request(params.merge(headers: {
+              'Content-Type' => 'application/json',
+              'Accept' => 'application/json',
+              'X-Auth-Token' => @auth_token
+            }.merge!(params[:headers] || {}),
+                                                        path: "#{@path}/#{params[:path]}",
+                                                        query: params[:query]))
+          rescue Excon::Errors::HTTPStatusError => error
+            raise case error
+                  when Excon::Errors::NotFound
+                    Fog::Compute::Aliyun::NotFound.slurp(error)
+                  else
+                    error
+              end
+          end
+
+          if !response.body.empty? && response.get_header('Content-Type') == 'application/json'
+            response.body = Fog::JSON.decode(response.body)
+          end
+
+          response
+        end
+
         # operation compute-- default URL
         def defaultAliyunUri(action, sigNonce, time)
           parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
@@ -312,6 +351,12 @@ module Fog
           '?Format=JSON&AccessKeyId=' + @aliyun_accesskey_id + '&Action=' + action + '&SignatureMethod=HMAC-SHA1&RegionId=' + @aliyun_region_id + '&SignatureNonce=' + sigNonce + '&SignatureVersion=1.0&Version=2014-05-26&Timestamp=' + urlTimeFormat
         end
 
+        def defaultAliyunVPCUri(action, sigNonce, time)
+          parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
+          urlTimeFormat = URI.encode(parTimeFormat, ':')
+          '?Format=JSON&AccessKeyId=' + @aliyun_accesskey_id + '&Action=' + action + '&SignatureMethod=HMAC-SHA1&RegionId=' + @aliyun_region_id + '&SignatureNonce=' + sigNonce + '&SignatureVersion=1.0&Version=2016-04-28&Timestamp=' + urlTimeFormat
+        end
+
         # generate random num
         def randonStr
           numStr = rand(100_000).to_s
@@ -337,6 +382,22 @@ module Fog
           para
         end
 
+        def defalutVPCParameters(action, sigNonce, time)
+          parTimeFormat = time.strftime('%Y-%m-%dT%H:%M:%SZ')
+          para = {
+            'Format' => 'JSON',
+            'Version' => '2016-04-28',
+            'Action' => action,
+            'AccessKeyId' => @aliyun_accesskey_id,
+            'SignatureVersion' => '1.0',
+            'SignatureMethod' => 'HMAC-SHA1',
+            'SignatureNonce' => sigNonce,
+            'RegionId' => @aliyun_region_id,
+            'Timestamp' => parTimeFormat
+          }
+          para
+        end
+
         # compute signature
         def sign(accessKeySecret, parameters)
           sortedParameters = parameters.sort

data/lib/fog/aliyun/requests/compute/create_vpn_connection.rb

@@ -0,0 +1,58 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        def create_vpn_connection(customergatewayId, vpngatewayId, localsubnet, remotesubnet,options = {})
+          # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&createvswitch]
+          action = 'CreateVpnConnection'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+          parameters['CustomerGatewayId'] = customergatewayId
+          pathUrl += '&CustomerGatewayId='
+          pathUrl += customergatewayId
+
+          parameters['VpnGatewayId'] = vpngatewayId
+          pathUrl += '&VpnGatewayId='
+          pathUrl += vpngatewayId
+
+          parameters['LocalSubnet'] = localsubnet
+          pathUrl += '&LocalSubnet='
+          pathUrl += localsubnet
+          
+          parameters['RemoteSubnet'] = remotesubnet
+          pathUrl += '&RemoteSubnet='
+          pathUrl += remotesubnet
+
+          name = options[:name]
+          ipsecconfig = options[:ipsecconfig]
+
+          if name
+            parameters['Name'] = name
+            pathUrl += '&Name='
+            pathUrl += name
+          end
+
+          if ipsecconfig
+            parameters['IpsecConfig'] = ipsecconfig
+            pathUrl += '&IpsecConfig='
+            pathUrl += ipsecconfig
+          end
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+    end # aliyun
+  end # compute
+end # fog

data/lib/fog/aliyun/requests/compute/create_vpn_customergateway.rb

@@ -0,0 +1,48 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        def create_vpn_customergateway(ipaddress, options = {})
+          # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&createvswitch]
+          action = 'CreateCustomerGateway'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+          parameters['IpAddress'] = ipaddress
+          pathUrl += '&IpAddress='
+          pathUrl += ipaddress
+
+
+
+          name = options[:name]
+          desc = options[:description]
+
+          if name
+            parameters['Name'] = name
+            pathUrl += '&Name='
+            pathUrl += name
+          end
+
+          if desc
+            parameters['Description'] = desc
+            pathUrl += '&Description='
+            pathUrl += desc
+          end
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+    end # aliyun
+  end # compute
+end # fog

data/lib/fog/aliyun/requests/compute/delete_vpn_connection.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        def delete_vpn_connection(vpn_connectionid)
+          # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&deletevswitch]
+          action = 'DeleteVpnConnection'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+          if vpn_connectionid
+            parameters['VpnConnectionId'] = vpn_connectionid
+            pathUrl += '&VpnConnectionId='
+            pathUrl += vpn_connectionid
+          else
+            raise ArgumentError, 'Missing required vpn_connectionid'
+          end
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+    end # aliyun
+  end # compute
+end # fog

data/lib/fog/aliyun/requests/compute/delete_vpn_customergateway.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        def delete_vpn_customergateway(vpn_customergatewayid)
+          # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vswitch&deletevswitch]
+          action = 'DeleteCustomerGateway'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+          if vpn_customergatewayid
+            parameters['CustomerGatewayId'] = vpn_customergatewayid
+            pathUrl += '&CustomerGatewayId='
+            pathUrl += vpn_customergatewayid
+          else
+            raise ArgumentError, 'Missing required vpn_customergatewayid'
+          end
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+    end # aliyun
+  end # compute
+end # fog

data/lib/fog/aliyun/requests/compute/detach_disk.rb

@@ -18,7 +18,8 @@ module Fog
           parameters['DiskId'] = diskId
           pathUrl += '&DiskId='
           pathUrl += diskId
-
+          
+          device = _options[:device]
           if device
             parameters['Device'] = device
             pathUrl += '&Device='

data/lib/fog/aliyun/requests/compute/list_vpn_connections.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
+        def list_vpn_connections(options = {})
+          action = 'DescribeVpnConnections'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+          _VpnGatewayId = options[:vpngatewayId]
+          if _VpnGatewayId
+            parameters['VpnGatewayId'] = _VpnGatewayId
+            pathUrl += '&VpnGatewayId='
+            pathUrl += _VpnGatewayId
+          end
+
+          pageNumber = options[:pageNumber]
+          pageSize   = options[:pageSize]
+          if pageNumber
+            parameters['PageNumber'] = pageNumber
+            pathUrl += '&PageNumber='
+            pathUrl += pageNumber
+          end
+
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
+          pathUrl += '&PageSize='
+          pathUrl += pageSize
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+
+
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/list_vpn_customergateways.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
+        def list_vpn_customergateways(options = {})
+          action = 'DescribeCustomerGateways'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+
+          pageNumber = options[:pageNumber]
+          pageSize   = options[:pageSize]
+          if pageNumber
+            parameters['PageNumber'] = pageNumber
+            pathUrl += '&PageNumber='
+            pathUrl += pageNumber
+          end
+
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
+          pathUrl += '&PageSize='
+          pathUrl += pageSize
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+
+
+    end
+  end
+end

data/lib/fog/aliyun/requests/compute/list_vpn_gateways.rb

@@ -0,0 +1,49 @@
+module Fog
+  module Compute
+    class Aliyun
+      class Real
+        # {Aliyun API Reference}[https://docs.aliyun.com/?spm=5176.100054.3.1.DGkmH7#/pub/ecs/open-api/vpc&describevpcs]
+        def list_vpn_gateways(options = {})
+          action = 'DescribeVpnGateways'
+          sigNonce = randonStr
+          time = Time.new.utc
+
+          parameters = defalutVPCParameters(action, sigNonce, time)
+          pathUrl    = defaultAliyunVPCUri(action, sigNonce, time)
+
+          _VpcId = options[:vpcId]
+          if _VpcId
+            parameters['VpcId'] = _VpcId
+            pathUrl += '&VpcId='
+            pathUrl += _VpcId
+          end
+
+          pageNumber = options[:pageNumber]
+          pageSize   = options[:pageSize]
+          if pageNumber
+            parameters['PageNumber'] = pageNumber
+            pathUrl += '&PageNumber='
+            pathUrl += pageNumber
+          end
+
+          pageSize = '50' unless pageSize
+          parameters['PageSize'] = pageSize
+          pathUrl += '&PageSize='
+          pathUrl += pageSize
+
+          signature = sign(@aliyun_accesskey_secret, parameters)
+          pathUrl += '&Signature='
+          pathUrl += signature
+
+          VPCrequest(
+            expects: [200, 203],
+            method: 'GET',
+            path: pathUrl
+          )
+        end
+      end
+
+
+    end
+  end
+end

data/lib/fog/aliyun/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Aliyun
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aliyun
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Qinsi Deng, Jianxun Li, Jane Han
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,7 +159,7 @@ dependencies:
 description: As a FOG provider, fog-aliyun support aliyun OSS/ECS. It will support
   more aliyun services later.
 email:
-- dengqs@dtdream.com
+- dengqinsi@sina.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -223,6 +223,8 @@ files:
 - lib/fog/aliyun/requests/compute/create_server.rb
 - lib/fog/aliyun/requests/compute/create_snapshot.rb
 - lib/fog/aliyun/requests/compute/create_vpc.rb
+- lib/fog/aliyun/requests/compute/create_vpn_connection.rb
+- lib/fog/aliyun/requests/compute/create_vpn_customergateway.rb
 - lib/fog/aliyun/requests/compute/create_vswitch.rb
 - lib/fog/aliyun/requests/compute/delete_disk.rb
 - lib/fog/aliyun/requests/compute/delete_image.rb
@@ -234,6 +236,8 @@ files:
 - lib/fog/aliyun/requests/compute/delete_server.rb
 - lib/fog/aliyun/requests/compute/delete_snapshot.rb
 - lib/fog/aliyun/requests/compute/delete_vpc.rb
+- lib/fog/aliyun/requests/compute/delete_vpn_connection.rb
+- lib/fog/aliyun/requests/compute/delete_vpn_customergateway.rb
 - lib/fog/aliyun/requests/compute/delete_vswitch.rb
 - lib/fog/aliyun/requests/compute/detach_disk.rb
 - lib/fog/aliyun/requests/compute/join_security_group.rb
@@ -248,6 +252,9 @@ files:
 - lib/fog/aliyun/requests/compute/list_servers.rb
 - lib/fog/aliyun/requests/compute/list_snapshots.rb
 - lib/fog/aliyun/requests/compute/list_vpcs.rb
+- lib/fog/aliyun/requests/compute/list_vpn_connections.rb
+- lib/fog/aliyun/requests/compute/list_vpn_customergateways.rb
+- lib/fog/aliyun/requests/compute/list_vpn_gateways.rb
 - lib/fog/aliyun/requests/compute/list_vrouters.rb
 - lib/fog/aliyun/requests/compute/list_vswitchs.rb
 - lib/fog/aliyun/requests/compute/list_zones.rb
@@ -297,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Fog provider for Aliyun Web Services.