fog-openstack 0.1.12 → 0.1.13

data/lib/fog/network/openstack/requests/update_network.rb

@@ -2,14 +2,35 @@ module Fog
   module Network
     class OpenStack
       class Real
-        def update_network(network_id, options = {})
-          data = {'network' => {}}
+        # Not all options can be updated
+        UPDATE_OPTIONS = [
+          :name,
+          :shared,
+          :admin_state_up,
+          :qos_policy_id,
+          :port_security_enabled
+        ].freeze
+
+        # Not all extra options can be updated
+        UPDATE_EXTENTED_OPTIONS = [
+          :router_external
+        ].freeze
+
+        def self.update(options)
+          data = {}
+          UPDATE_OPTIONS.select { |o| options.key?(o) }.each do |key|
+            data[key.to_s] = options[key]
+          end
 
-          vanilla_options = [:name, :shared, :admin_state_up]
-          vanilla_options.select { |o| options.key?(o) }.each do |key|
-            data['network'][key] = options[key]
+          UPDATE_EXTENTED_OPTIONS.reject { |o| options[o].nil? }.each do |key|
+            aliased_key = ALIASES[key] || key
+            data[aliased_key] = options[key]
           end
+          data
+        end
 
+        def update_network(network_id, options = {})
+          data = {'network' => self.class.update(options)}
           request(
             :body    => Fog::JSON.encode(data),
             :expects => 200,
@@ -23,9 +44,7 @@ module Fog
         def update_network(network_id, options = {})
           response = Excon::Response.new
           if network = list_networks.body['networks'].find { |_| _['id'] == network_id }
-            network['name']           = options[:name]
-            network['shared']         = options[:shared]
-            network['admin_state_up'] = options[:admin_state_up]
+            network.merge!(Fog::Network::OpenStack::Real.update(options))
             response.body = {'network' => network}
             response.status = 200
             response

data/lib/fog/openstack.rb

@@ -5,71 +5,87 @@ require 'fog/json'
 require 'fog/openstack/core'
 require 'fog/openstack/errors'
 
-require 'fog/compute/openstack'
-require 'fog/dns/openstack/v1'
-require 'fog/dns/openstack/v2'
-require 'fog/identity/openstack/v2'
-require 'fog/identity/openstack/v3'
-require 'fog/image/openstack/v1'
-require 'fog/image/openstack/v2'
-require 'fog/monitoring/openstack'
-require 'fog/network/openstack'
 require 'fog/planning/openstack'
-require 'fog/storage/openstack'
-require 'fog/volume/openstack/v1'
-require 'fog/volume/openstack/v2'
 
 module Fog
+  module Baremetal
+    autoload :OpenStack, File.expand_path('../baremetal/openstack', __FILE__)
+  end
+
   module Compute
     autoload :OpenStack, File.expand_path('../compute/openstack', __FILE__)
   end
 
+  module DNS
+    autoload :OpenStack, File.expand_path('../dns/openstack', __FILE__)
+
+    class OpenStack
+      autoload :V1, File.expand_path('../dns/openstack/v1', __FILE__)
+      autoload :V2, File.expand_path('../dns/openstack/v2', __FILE__)
+    end
+  end
+
   module Identity
     autoload :OpenStack, File.expand_path('../identity/openstack', __FILE__)
+
+    class OpenStack
+      autoload :V2, File.expand_path('../identity/openstack/v2', __FILE__)
+      autoload :V3, File.expand_path('../identity/openstack/v3', __FILE__)
+    end
   end
 
   module Image
     autoload :OpenStack, File.expand_path('../image/openstack', __FILE__)
+
+    class OpenStack
+      autoload :V1, File.expand_path('../image/openstack/v1', __FILE__)
+      autoload :V2, File.expand_path('../image/openstack/v2', __FILE__)
+    end
+  end
+
+  module Introspection
+    autoload :OpenStack, File.expand_path('../introspection/openstack', __FILE__)
   end
 
   module Metering
     autoload :OpenStack, File.expand_path('../metering/openstack', __FILE__)
   end
 
-  module Network
-    autoload :OpenStack, File.expand_path('../network/openstack', __FILE__)
+  module Monitoring
+    autoload :OpenStack, File.expand_path('../monitoring/openstack', __FILE__)
   end
 
-  module Orchestration
-    autoload :OpenStack, File.expand_path('../orchestration/openstack', __FILE__)
+  module Network
+    autoload :OpenStack, File.expand_path('../network/openstack', __FILE__)
   end
 
   module NFV
     autoload :OpenStack, File.expand_path('../nfv/openstack', __FILE__)
   end
 
-  module Volume
-    autoload :OpenStack, File.expand_path('../volume/openstack', __FILE__)
+  module Orchestration
+    autoload :OpenStack, File.expand_path('../orchestration/openstack', __FILE__)
   end
 
-  module Baremetal
-    autoload :OpenStack, File.expand_path('../baremetal/openstack', __FILE__)
+  module Storage
+    autoload :OpenStack, File.expand_path('../storage/openstack', __FILE__)
   end
 
-  module Introspection
-    autoload :OpenStack, File.expand_path('../introspection/openstack', __FILE__)
-  end
+  module Volume
+    autoload :OpenStack, File.expand_path('../volume/openstack', __FILE__)
 
-  module Monitoring
-    autoload :OpenStack, File.expand_path('../monitoring/openstack', __FILE__)
+    class OpenStack
+      autoload :V1, File.expand_path('../volume/openstack/v1', __FILE__)
+      autoload :V2, File.expand_path('../volume/openstack/v2', __FILE__)
+    end
   end
 
   module Workflow
     autoload :OpenStack, File.expand_path('../workflow/openstack', __FILE__)
-  end
 
-  module DNS
-    autoload :OpenStack, File.expand_path('../dns/openstack', __FILE__)
+    class OpenStack
+      autoload :V2, File.expand_path('../workflow/openstack/v2', __FILE__)
+    end
   end
 
   module OpenStack

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Openstack
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

data/lib/fog/orchestration/openstack.rb

@@ -53,6 +53,7 @@ module Fog
       request :update_stack
       request :patch_stack
       request :validate_template
+      request :cancel_update
 
       module Reflectable
         REFLECTION_REGEX = /\/stacks\/(\w+)\/([\w|-]+)\/resources\/(\w+)/

data/lib/fog/orchestration/openstack/models/stack.rb

@@ -64,6 +64,10 @@ module Fog
           service.abandon_stack(self)
         end
 
+        def cancel_update
+          service.cancel_update(self)
+        end
+
         # Deprecated
         def template_url
           Fog::Logger.deprecation("#template_url is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]")

data/lib/fog/orchestration/openstack/requests/cancel_update.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+module Fog
+  module Orchestration
+    class OpenStack
+      class Real
+        def cancel_update(stack)
+          request(
+            :expects => 200,
+            :method  => 'POST',
+            :path    => "stacks/#{stack.stack_name}/#{stack.id}/actions",
+            :body    => Fog::JSON.encode('cancel_update' => nil)
+          )
+        end
+      end
+
+      class Mock
+        def cancel_update(_)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {}
+          response
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +443,10 @@ files:
 - lib/fog/dns/openstack/v1/requests/list_domains.rb
 - lib/fog/dns/openstack/v1/requests/update_quota.rb
 - lib/fog/dns/openstack/v2.rb
+- lib/fog/dns/openstack/v2/models/recordset.rb
+- lib/fog/dns/openstack/v2/models/recordsets.rb
+- lib/fog/dns/openstack/v2/models/zone.rb
+- lib/fog/dns/openstack/v2/models/zones.rb
 - lib/fog/dns/openstack/v2/requests/create_recordset.rb
 - lib/fog/dns/openstack/v2/requests/create_zone.rb
 - lib/fog/dns/openstack/v2/requests/delete_recordset.rb
@@ -681,6 +671,8 @@ files:
 - lib/fog/monitoring/openstack/models/alarm_state.rb
 - lib/fog/monitoring/openstack/models/alarm_states.rb
 - lib/fog/monitoring/openstack/models/alarms.rb
+- lib/fog/monitoring/openstack/models/dimension_value.rb
+- lib/fog/monitoring/openstack/models/dimension_values.rb
 - lib/fog/monitoring/openstack/models/measurement.rb
 - lib/fog/monitoring/openstack/models/measurements.rb
 - lib/fog/monitoring/openstack/models/metric.rb
@@ -705,15 +697,18 @@ files:
 - lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb
 - lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb
 - lib/fog/monitoring/openstack/requests/list_alarms.rb
+- lib/fog/monitoring/openstack/requests/list_dimension_values.rb
 - lib/fog/monitoring/openstack/requests/list_metric_names.rb
 - lib/fog/monitoring/openstack/requests/list_metrics.rb
+- lib/fog/monitoring/openstack/requests/list_notification_method_types.rb
 - lib/fog/monitoring/openstack/requests/list_notification_methods.rb
 - lib/fog/monitoring/openstack/requests/list_statistics.rb
 - lib/fog/monitoring/openstack/requests/patch_alarm.rb
 - lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb
+- lib/fog/monitoring/openstack/requests/patch_notification_method.rb
+- lib/fog/monitoring/openstack/requests/put_notification_method.rb
 - lib/fog/monitoring/openstack/requests/update_alarm.rb
 - lib/fog/monitoring/openstack/requests/update_alarm_definition.rb
-- lib/fog/monitoring/openstack/requests/update_notification_method.rb
 - lib/fog/network/openstack.rb
 - lib/fog/network/openstack/models/floating_ip.rb
 - lib/fog/network/openstack/models/floating_ips.rb
@@ -869,6 +864,7 @@ files:
 - lib/fog/orchestration/openstack/models/templates.rb
 - lib/fog/orchestration/openstack/requests/abandon_stack.rb
 - lib/fog/orchestration/openstack/requests/build_info.rb
+- lib/fog/orchestration/openstack/requests/cancel_update.rb
 - lib/fog/orchestration/openstack/requests/create_stack.rb
 - lib/fog/orchestration/openstack/requests/delete_stack.rb
 - lib/fog/orchestration/openstack/requests/get_stack_template.rb
@@ -1140,19 +1136,6 @@ files:
 - lib/fog/workflow/openstack/v2/requests/validate_workbook.rb
 - lib/fog/workflow/openstack/v2/requests/validate_workflow.rb
 - supported.md
-- tests/fixtures/introspection.yaml
-- tests/helper.rb
-- tests/helpers/collection_helper.rb
-- tests/helpers/compute/flavors_helper.rb
-- tests/helpers/compute/server_helper.rb
-- tests/helpers/compute/servers_helper.rb
-- tests/helpers/formats_helper.rb
-- tests/helpers/formats_helper_tests.rb
-- tests/helpers/mock_helper.rb
-- tests/helpers/model_helper.rb
-- tests/helpers/responds_to_helper.rb
-- tests/helpers/schema_validator_tests.rb
-- tests/helpers/succeeds_helper.rb
 homepage: https://github.com/fog/fog-openstack
 licenses:
 - MIT

data/tests/fixtures/introspection.yaml

@@ -1,287 +0,0 @@
----
-:rules:
-  - description: Successful Rule
-    actions:
-    - action: set-attribute
-      path: /extra/rule_success
-      value: 'yes'
-    conditions:
-    - field: memory_mb
-      op: ge
-      value: 256
-    - field: local_gb
-      op: ge
-      value: 1
-    links:
-    - href: /v1/rules/8dbc8e15-506e-4bd1-82e7-b090e0d33cae
-      rel: self
-    uuid: 8dbc8e15-506e-4bd1-82e7-b090e0d33cae
-  - description: Failing Rule
-    actions:
-    - action: set-attribute
-      path: /extra/rule_success
-      value: 'no'
-    - action: fail
-      message: This rule should not have run
-    conditions:
-    - field: memory_mb
-      op: lt
-      value: 42
-    - field: local_gb
-      op: eq
-      value: 0
-    links:
-    - href: /v1/rules/abf9337e-a38d-4041-ba7a-d4e5ac0cc134
-      rel: self
-    uuid: abf9337e-a38d-4041-ba7a-d4e5ac0cc134
-:introspection_data:
-  cpu_arch: x86_64
-  macs:
-  - 52:54:00:40:d0:11
-  root_disk:
-    rotational: true
-    vendor: '0x1af4'
-    name: "/dev/vda"
-    wwn_vendor_extension:
-    wwn_with_extension:
-    model: ''
-    wwn:
-    serial:
-    size: 64424509440
-  extra:
-    network:
-      eth0:
-        vlan-challenged: off [fixed]
-        tx-udp_tnl-segmentation: off [fixed]
-        ipv4-network: 192.0.2.0
-        rx-vlan-stag-filter: off [fixed]
-        highdma: on [fixed]
-        tx-nocache-copy: 'off'
-        tx-gso-robust: off [fixed]
-        fcoe-mtu: off [fixed]
-        netns-local: off [fixed]
-        udp-fragmentation-offload: 'on'
-        serial: 52:54:00:40:d0:11
-        latency: 0
-        tx-checksumming/tx-checksum-ipv6: off [fixed]
-        tx-checksumming/tx-checksum-ipv4: off [fixed]
-        ipv4-netmask: 255.255.255.0
-        tcp-segmentation-offload/tx-tcp-segmentation: 'on'
-        tx-ipip-segmentation: off [fixed]
-        rx-vlan-offload: off [fixed]
-        tx-gre-segmentation: off [fixed]
-        tx-checksumming/tx-checksum-ip-generic: 'on'
-        tcp-segmentation-offload/tx-tcp-ecn-segmentation: 'on'
-        tx-checksumming/tx-checksum-fcoe-crc: off [fixed]
-        ipv4: 192.0.2.100
-        businfo: pci@0000:00:03.0
-        rx-vlan-stag-hw-parse: off [fixed]
-        tx-vlan-offload: off [fixed]
-        product: Virtio network device
-        vendor: Red Hat, Inc
-        tx-checksumming/tx-checksum-sctp: off [fixed]
-        driver: virtio_net
-        tx-sit-segmentation: off [fixed]
-        busy-poll: off [fixed]
-        tx-vlan-stag-hw-insert: off [fixed]
-        scatter-gather/tx-scatter-gather: 'on'
-        link: 'yes'
-        ntuple-filters: off [fixed]
-        rx-all: off [fixed]
-        tcp-segmentation-offload: 'on'
-        tcp-segmentation-offload/tx-tcp6-segmentation: 'on'
-        rx-checksumming: on [fixed]
-        rx-fcs: off [fixed]
-        tx-lockless: off [fixed]
-        generic-segmentation-offload: 'on'
-        tx-fcoe-segmentation: off [fixed]
-        tx-checksumming: 'on'
-        ipv4-cidr: 24
-        large-receive-offload: off [fixed]
-        rx-vlan-filter: on [fixed]
-        receive-hashing: off [fixed]
-        scatter-gather/tx-scatter-gather-fraglist: off [fixed]
-        generic-receive-offload: 'on'
-        loopback: off [fixed]
-        scatter-gather: 'on'
-        tx-mpls-segmentation: off [fixed]
-      eth1:
-        vlan-challenged: off [fixed]
-        tx-udp_tnl-segmentation: off [fixed]
-        tx-vlan-stag-hw-insert: off [fixed]
-        rx-vlan-stag-filter: off [fixed]
-        highdma: on [fixed]
-        tx-nocache-copy: 'off'
-        tx-gso-robust: off [fixed]
-        fcoe-mtu: off [fixed]
-        netns-local: off [fixed]
-        udp-fragmentation-offload: 'on'
-        serial: 52:54:00:11:c5:d8
-        latency: 0
-        tx-checksumming/tx-checksum-ipv6: off [fixed]
-        tx-checksumming/tx-checksum-ipv4: off [fixed]
-        tx-fcoe-segmentation: off [fixed]
-        tcp-segmentation-offload/tx-tcp-segmentation: 'on'
-        tx-ipip-segmentation: off [fixed]
-        rx-vlan-offload: off [fixed]
-        tx-gre-segmentation: off [fixed]
-        tx-checksumming/tx-checksum-ip-generic: 'on'
-        tcp-segmentation-offload/tx-tcp-ecn-segmentation: 'on'
-        tx-checksumming/tx-checksum-fcoe-crc: off [fixed]
-        rx-vlan-stag-hw-parse: off [fixed]
-        businfo: pci@0000:00:04.0
-        tx-vlan-offload: off [fixed]
-        product: Virtio network device
-        vendor: Red Hat, Inc
-        tx-checksumming/tx-checksum-sctp: off [fixed]
-        driver: virtio_net
-        tx-sit-segmentation: off [fixed]
-        busy-poll: off [fixed]
-        scatter-gather/tx-scatter-gather: 'on'
-        link: 'yes'
-        ntuple-filters: off [fixed]
-        rx-all: off [fixed]
-        tcp-segmentation-offload: 'on'
-        tcp-segmentation-offload/tx-tcp6-segmentation: 'on'
-        rx-checksumming: on [fixed]
-        tx-lockless: off [fixed]
-        generic-segmentation-offload: 'on'
-        loopback: off [fixed]
-        tx-checksumming: 'on'
-        large-receive-offload: off [fixed]
-        rx-vlan-filter: on [fixed]
-        receive-hashing: off [fixed]
-        scatter-gather/tx-scatter-gather-fraglist: off [fixed]
-        generic-receive-offload: 'on'
-        rx-fcs: off [fixed]
-        scatter-gather: 'on'
-        tx-mpls-segmentation: off [fixed]
-    firmware:
-      bios:
-        date: 01/01/2011
-        version: 0.5.1
-        vendor: Seabios
-    system:
-      kernel:
-        cmdline: ipa-inspection-callback-url=http://192.0.2.1:5050/v1/continue ipa-inspection-collectors=default,extra-hardware,logs
-          systemd.journald.forward_to_console=yes BOOTIF=52:54:00:40:d0:11 ipa-debug=1
-        version: 3.10.0-327.10.1.el7.x86_64
-        arch: x86_64
-      product:
-        version: RHEL 7.0.0 PC (i440FX + PIIX, 1996)
-        vendor: Red Hat
-        name: KVM
-        uuid: FB25FBC2-3FF7-45C0-8581-3EF1BA7E7839
-      os:
-        version: Red Hat Enterprise Linux Server release 7.2 (Maipo)
-        vendor: RedHatEnterpriseServer
-    memory:
-      total:
-        size: 4294967296
-    disk:
-      vda:
-        optimal_io_size: 0
-        physical_block_size: 512
-        rotational: 1
-        vendor: '0x1af4'
-        size: 64
-      logical:
-        count: 1
-    cpu:
-      logical:
-        number: 4
-      physical_0:
-        physid: 401
-        product: Intel Xeon E312xx (Sandy Bridge)
-        frequency: 2000000000
-        vendor: Intel Corp.
-        flags: fpu fpu_exception wp de pse tsc msr pae mce cx8 apic sep mtrr pge mca
-          cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx rdtscp x86-64 constant_tsc
-          rep_good nopl eagerfpu pni pclmulqdq vmx ssse3 cx16 sse4_1 sse4_2 x2apic
-          popcnt tsc_deadline_timer aes xsave avx hypervisor lahf_lm tpr_shadow vnmi
-          flexpriority ept xsaveopt xsavec xgetbv1
-      physical_1:
-        physid: 402
-        product: Intel Xeon E312xx (Sandy Bridge)
-        frequency: 2000000000
-        vendor: Intel Corp.
-        flags: fpu fpu_exception wp de pse tsc msr pae mce cx8 apic sep mtrr pge mca
-          cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx rdtscp x86-64 constant_tsc
-          rep_good nopl eagerfpu pni pclmulqdq vmx ssse3 cx16 sse4_1 sse4_2 x2apic
-          popcnt tsc_deadline_timer aes xsave avx hypervisor lahf_lm tpr_shadow vnmi
-          flexpriority ept xsaveopt xsavec xgetbv1
-      physical_2:
-        physid: 403
-        product: Intel Xeon E312xx (Sandy Bridge)
-        frequency: 2000000000
-        vendor: Intel Corp.
-        flags: fpu fpu_exception wp de pse tsc msr pae mce cx8 apic sep mtrr pge mca
-          cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx rdtscp x86-64 constant_tsc
-          rep_good nopl eagerfpu pni pclmulqdq vmx ssse3 cx16 sse4_1 sse4_2 x2apic
-          popcnt tsc_deadline_timer aes xsave avx hypervisor lahf_lm tpr_shadow vnmi
-          flexpriority ept xsaveopt xsavec xgetbv1
-      physical_3:
-        physid: 404
-        product: Intel Xeon E312xx (Sandy Bridge)
-        frequency: 2000000000
-        vendor: Intel Corp.
-        flags: fpu fpu_exception wp de pse tsc msr pae mce cx8 apic sep mtrr pge mca
-          cmov pat pse36 clflush mmx fxsr sse sse2 syscall nx rdtscp x86-64 constant_tsc
-          rep_good nopl eagerfpu pni pclmulqdq vmx ssse3 cx16 sse4_1 sse4_2 x2apic
-          popcnt tsc_deadline_timer aes xsave avx hypervisor lahf_lm tpr_shadow vnmi
-          flexpriority ept xsaveopt xsavec xgetbv1
-      physical:
-        number: 4
-  interfaces:
-    eth0:
-      ip: 192.0.2.100
-      mac: 52:54:00:40:d0:11
-  cpus: 4
-  boot_interface: 52:54:00:40:d0:11
-  memory_mb: 4096
-  ipmi_address: ''
-  inventory:
-    bmc_address: ''
-    interfaces:
-    - ipv4_address:
-      switch_port_descr:
-      switch_chassis_descr:
-      name: eth1
-      mac_address: 52:54:00:11:c5:d8
-    - ipv4_address: 192.0.2.100
-      switch_port_descr:
-      switch_chassis_descr:
-      name: eth0
-      mac_address: 52:54:00:40:d0:11
-    disks:
-    - rotational: true
-      vendor: '0x1af4'
-      name: "/dev/vda"
-      wwn_vendor_extension:
-      wwn_with_extension:
-      model: ''
-      wwn:
-      serial:
-      size: 64424509440
-    system_vendor:
-      serial_number: Not Specified
-      product_name: KVM
-      manufacturer: Red Hat
-    memory:
-      physical_mb: 4096
-      total: 4144173056
-    cpu:
-      count: 4
-      frequency: '3408.032'
-      model_name: Intel Xeon E312xx (Sandy Bridge)
-      architecture: x86_64
-  error:
-  local_gb: 59
-  all_interfaces:
-    eth1:
-      ip:
-      mac: 52:54:00:11:c5:d8
-    eth0:
-      ip: 192.0.2.100
-      mac: 52:54:00:40:d0:11
-  logs: Way too long...