fog-huaweicloud 0.0.3 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a0fea20eda46cb34760f2535e6647fc29a3da5
-  data.tar.gz: 0a287393066b8a9857f361fffd51c45cf6482fdf
+  metadata.gz: 073897e81a5750e2b73cfcf2019d1515f6bf174e
+  data.tar.gz: f174d120d9376189cc3905ca70675a80776d7e16
 SHA512:
-  metadata.gz: b219778ca6cff3d7168cc465b7e1d394c9beb676b5f32cc9950e55f84aa5e21160b79bcbcf532bd96f497586cf85f2456134cdc8231a1f9a5859fdb3f4464966
-  data.tar.gz: 72e3e133d239b70ae13e02b8b673234da216db7f3d3cc99f0836dff03d53aa8ce4642cb079bca5178e9d2f0795a3aff90c96e5d7b343826f87464317ca60f67c
+  metadata.gz: 095e90b2e07b86aa5866fee0e71485a2f3cbdc97fd4d0dcd53f235a2ad369bd0548e4d7a8794c027db7fa9edd72d28b89450dc60b32ba5f9fc512f8e2702e570
+  data.tar.gz: 46ae77270c82fd44c3143ed9a3ac39e217be21ff9640f212a56196060d8aad45e931f87443b2b4f993c5cd8d7b59386b977bbfda865f8417351f0ef80829ece1

data/CHANGELOG.md

@@ -44,4 +44,4 @@
 ## Compute
 
 * create_server and the Server model where updated to allow booting a VM
-  with NICs (subnet_id, port_id, fixed_ip).
+  with NICs (net_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",
-                  "subnet_id" => "3cb9bc59-5699-4588-a4b1-b87f96708bc6",
+                  "net_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 :subnet_id
+        attribute :net_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[:subnet_id]
-            body['interfaceAttachment']['subnet_id'] = options[:subnet_id]
+          elsif options[:net_id]
+            body['interfaceAttachment']['net_id'] = options[:net_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['subnet_id'] || nic[:subnet_id]) unless (nic['subnet_id'] || nic[:subnet_id]).nil?
+                neti['uuid'] = (nic['net_id'] || nic[:net_id]) unless (nic['net_id'] || nic[:net_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,18 +76,12 @@ module Fog
 
       private
 
-      def request(params, parse_json = true, overwrite_version={})
+      def request(params, parse_json = true)
         retried = false
         begin
-          # NOTE: This is only for transition usage. It should be removed once we upgraded all
-          # the APIs to non-OpenStack version.
-          real_path = @path.clone
-          overwrite_version.each do |key, value|
-            real_path.sub!(key, value)
-          end
           response = @connection.request(params.merge(
                                            :headers => headers(params.delete(:headers)),
-                                           :path    => "#{real_path}/#{params[:path]}"
+                                           :path    => "#{@path}/#{params[:path]}"
           ))
         rescue Excon::Errors::Unauthorized => error
           # token expiration and token renewal possible

data/lib/fog/huaweicloud/version.rb

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

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

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

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

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

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

@@ -2,17 +2,18 @@ module Fog
   module Network
     class HuaweiCloud
       class Real
-        def list_subnets(filters = {}, openstack_compatible = true)
-          overwrite_version = openstack_compatible ? {} : {"v2.0" => "v1/#{@current_tenant['id']}"}
+        def list_subnets(filters = {})
           request(
-            {:expects => 200, :method => 'GET', :path => 'subnets', :query => filters},
-            true, overwrite_version
+            :expects => 200,
+            :method  => 'GET',
+            :path    => 'subnets',
+            :query   => filters
           )
         end
       end
 
       class Mock
-        def list_subnets(_filters = {}, openstack_compatible = true)
+        def list_subnets(_filters = {})
           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.0.3
+  version: 0.1.2
 platform: ruby
 authors:
 - Huawei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core