staypuft 0.5.24 → 0.5.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c7ab92785c50b5c9c497f999f61edfb015962c9
-  data.tar.gz: 23d1a73292437f693a1e91cfa26467f65a9267db
+  metadata.gz: ffd1b0e75ea93be655e5a9ed78dc1d92835a2558
+  data.tar.gz: 3e1a331af324795f224fc3f9d8508b02eb37e9e9
 SHA512:
-  metadata.gz: ccc1fafac03e29b8157693b4ce0002fec843b3905f944a074262bbb4cb95aa618528b523cc5d0b9c67b2f582ca3067ce40d0508a48f6d5e7f06cede42063e62d
-  data.tar.gz: 788ea701bd4e73721036dad19d4d0dcbd15e888230f63f3e52a209e1b2c0d7484b4af866537e77d7297e9e9fc0b8049a6b0fc0de1bcf6ef2a96b9d9276b30b7b
+  metadata.gz: 924657d23f3137033ad7e9786a3c701cf4a78cc0e6e704d2918ff9efa4033ab1a6d6a356ba896bf5168eb1afdba9d9461a450c5e2d4e3d429b5e46b78312f396
+  data.tar.gz: ccc4eab8e7d0a9225bc4bb69c30097f58608cb4af21494e39aa69ac4d65e10f4c4297aed9dcb1fc3e45a9c8ad6f4eb0d129da0da2b726f47070621d445b319c2

data/app/lib/staypuft/network_query.rb

@@ -59,6 +59,29 @@ module Staypuft
       interface_hash_for_host(subnet_type_name, host)[:subnet]
     end
 
+    def interfaces_for_tenant_subnet(host=@host)
+      interface_hash = interface_hash_for_host(
+        Staypuft::SubnetType::TENANT, host)
+      return [] if interface_hash.empty?
+      subnet = interface_hash[:subnet]
+      top_level_interface = host.interfaces.where(
+        identifier: interface_hash[:interface]).first
+      interfaces = [top_level_interface.identifier]
+      if subnet && subnet.has_vlanid?
+        next_interface = host.interfaces.where(identifier:
+          top_level_interface.attached_to).first
+        interfaces << next_interface.identifier
+        if next_interface.is_a? Nic::Bond
+          interfaces << next_interface.attached_devices_identifiers
+        end
+      end
+      interfaces.flatten
+    end
+
+    def tenant_interface?(interface, host=@host)
+      interfaces_for_tenant_subnet(host).include?(interface)
+    end
+
     def mtu_for_tenant_subnet
       mtu = @deployment.neutron_networking? ? @deployment.neutron.network_device_mtu : @deployment.nova.network_device_mtu
     end
@@ -118,7 +141,8 @@ module Staypuft
       allow :ip_for_host, :interface_for_host, :network_address_for_host,
             :controller_ip, :controller_ips, :controller_fqdns, :get_vip, :controller_pcmk_shortnames,
             :subnet_for_host, :gateway_subnet, :gateway_interface, :gateway_interface_mac,
-            :tenant_subnet?, :mtu_for_tenant_subnet, :controller_lb_backend_shortnames
+            :tenant_subnet?, :mtu_for_tenant_subnet, :controller_lb_backend_shortnames,
+            :interfaces_for_tenant_subnet, :tenant_interface?
     end
 
     private

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.24'
+  VERSION = '0.5.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.24
+  version: 0.5.25
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks