fog-huaweicloud 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 073897e81a5750e2b73cfcf2019d1515f6bf174e
-  data.tar.gz: f174d120d9376189cc3905ca70675a80776d7e16
+  metadata.gz: 3658c42ce92b40bc32fe8a49f87b2eeb4e78bc6d
+  data.tar.gz: 99511f7291d1249bcf3d620d538b86cff9191f7a
 SHA512:
-  metadata.gz: 095e90b2e07b86aa5866fee0e71485a2f3cbdc97fd4d0dcd53f235a2ad369bd0548e4d7a8794c027db7fa9edd72d28b89450dc60b32ba5f9fc512f8e2702e570
-  data.tar.gz: 46ae77270c82fd44c3143ed9a3ac39e217be21ff9640f212a56196060d8aad45e931f87443b2b4f993c5cd8d7b59386b977bbfda865f8417351f0ef80829ece1
+  metadata.gz: 7be3372fe0f4d9b2e4c36cc6e44eb2c7477a49e23e2a55913df8e34d4bde250af6a22e0ee87ccc986572b0ddafa924ab7d8c2de14f0eee2b0c8ac4abcba2018b
+  data.tar.gz: 7f8a27335479bcf577b310ce5b1cd09d2d3fb7d5580f469c98b5a3cc1b667ab24e76251e8c84fd5f9e2326a7a95d8ed551d654540c0f8cf5f6538bccc4988faf

data/CHANGELOG.md

@@ -44,4 +44,4 @@
 ## Compute
 
 * create_server and the Server model where updated to allow booting a VM
-  with NICs (net_id, port_id, fixed_ip).
+  with NICs (subnet_id, port_id, fixed_ip).

data/lib/fog/compute/huaweicloud.rb

@@ -336,7 +336,7 @@ module Fog
                     }
                   ],
                   "mac_addr" => "fa:16:3e:4c:2c:30",
-                  "net_id" => "3cb9bc59-5699-4588-a4b1-b87f96708bc6",
+                  "subnet_id" => "3cb9bc59-5699-4588-a4b1-b87f96708bc6",
                   "port_id" => "ce531f90-199f-48c0-816c-13e38010b442",
                   "port_state" => "ACTIVE"
                 }

data/lib/fog/compute/huaweicloud/models/os_interface.rb

@@ -7,7 +7,7 @@ module Fog
         identity  :port_id
         attribute :fixed_ips, :type => :array
         attribute :mac_addr
-        attribute :net_id
+        attribute :subnet_id
         attribute :port_state
       end
     end

data/lib/fog/compute/huaweicloud/requests/create_os_interface.rb

@@ -12,8 +12,8 @@ module Fog
 
           if options[:port_id]
             body['interfaceAttachment']['port_id'] = options[:port_id]
-          elsif options[:net_id]
-            body['interfaceAttachment']['net_id'] = options[:net_id]
+          elsif options[:subnet_id]
+            body['interfaceAttachment']['subnet_id'] = options[:subnet_id]
           end
 
           if options[:ip_address]

data/lib/fog/compute/huaweicloud/requests/create_server.rb

@@ -46,7 +46,7 @@ module Fog
             data['server']['networks'] =
               Array(options['nics']).map do |nic|
                 neti = {}
-                neti['uuid'] = (nic['net_id'] || nic[:net_id]) unless (nic['net_id'] || nic[:net_id]).nil?
+                neti['uuid'] = (nic['subnet_id'] || nic[:subnet_id]) unless (nic['subnet_id'] || nic[:subnet_id]).nil?
                 neti['fixed_ip'] = (nic['v4_fixed_ip'] || nic[:v4_fixed_ip]) unless (nic['v4_fixed_ip'] || nic[:v4_fixed_ip]).nil?
                 neti['port'] = (nic['port_id'] || nic[:port_id]) unless (nic['port_id'] || nic[:port_id]).nil?
                 neti

data/lib/fog/huaweicloud/core.rb

@@ -76,9 +76,14 @@ module Fog
 
       private
 
-      def request(params, parse_json = true)
+      def request(params, parse_json = true, overwrite_version={})
         retried = false
         begin
+          # NOTE: This is only for transition usage. It should be removed once we upgraded all
+          # the APIs to non-OpenStack version.
+          overwrite_version.each do |key, value|
+            @path.sub!(key, value + "/" + @current_tenant['id']))
+          end
           response = @connection.request(params.merge(
                                            :headers => headers(params.delete(:headers)),
                                            :path    => "#{@path}/#{params[:path]}"

data/lib/fog/huaweicloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module HuaweiCloud
-    VERSION = '0.1.2'.freeze
+    VERSION = '0.1.3'.freeze
   end
 end

data/lib/fog/network/huaweicloud/models/subnets.rb

@@ -14,13 +14,13 @@ module Fog
           super
         end
 
-        def all(filters_arg = filters)
+        def all(filters_arg = filters, openstack_compatible=true)
           filters = filters_arg
-          load_response(service.list_subnets(filters), 'subnets')
+          load_response(service.list_subnets(filters, openstack_compatible), 'subnets')
         end
 
-        def get(subnet_id)
-          if subnet = service.get_subnet(subnet_id).body['subnet']
+        def get(subnet_id, openstack_compatible=true)
+          if subnet = service.get_subnet(subnet_id, openstack_compatible).body['subnet']
             new(subnet)
           end
         rescue Fog::Network::HuaweiCloud::NotFound

data/lib/fog/network/huaweicloud/requests/get_subnet.rb

@@ -2,17 +2,16 @@ module Fog
   module Network
     class HuaweiCloud
       class Real
-        def get_subnet(subnet_id)
-          request(
-            :expects => [200],
-            :method  => 'GET',
-            :path    => "subnets/#{subnet_id}"
+        def get_subnet(subnet_id,openstack_compatible = true)
+          overwrite_version = openstack_compatible ? {} : {'v2.0' => 'v1'}
+          request({:expects => [200], :method=> 'GET', :path => "subnets/#{subnet_id}"},
+                  true, overwrite_version
           )
         end
       end
 
       class Mock
-        def get_subnet(subnet_id)
+        def get_subnet(subnet_id, openstack_compatible = true)
           response = Excon::Response.new
           if data = self.data[:subnets][subnet_id]
             response.status = 200

data/lib/fog/network/huaweicloud/requests/list_subnets.rb

@@ -2,18 +2,17 @@ module Fog
   module Network
     class HuaweiCloud
       class Real
-        def list_subnets(filters = {})
+        def list_subnets(filters = {}, openstack_compatible = true)
+          overwrite_version = openstack_compatible ? {} : {'v2.0' => 'v1'}
           request(
-            :expects => 200,
-            :method  => 'GET',
-            :path    => 'subnets',
-            :query   => filters
+            {:expects => 200, :method => 'GET', :path => 'subnets', :query => filters},
+            true, overwrite_version
           )
         end
       end
 
       class Mock
-        def list_subnets(_filters = {})
+        def list_subnets(_filters = {}, openstack_compatible = true)
           Excon::Response.new(
             :body   => {'subnets' => data[:subnets].values},
             :status => 200

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-huaweicloud
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Huawei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core