nub 0.0.136 → 0.0.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc637d2de51ea4c4473d8659baae4e93f479e210825735eac4810ac504a802a6
-  data.tar.gz: 244953131f4c7bf9e89f9f6f5320d18691f1fb6db134c40de79388cb1a86800e
+  metadata.gz: 89f02089be4f4ce91020479f5812fa4089143e32e73eced4c65ce5f2f1cf0b54
+  data.tar.gz: 245d02777cfe330471fa7b50d801f1c0044ed8a5df9dabf6eb1bdf8db82bde7a
 SHA512:
-  metadata.gz: f6f526accb8fdfad3a18c5ac1b1f4a709f468d620560fcfa2ac545f2057fc4b93ad1c8b88f406f85381846b4cba1ae91f48092945d4054cbac0fb044c2842c41
-  data.tar.gz: 6d64c6c44ff233cc4dd781837eef8bad11ce2944804ee27623c914778d2d851630d82fa22231064182a065b2fc6bab39dc9b39a4d85eb49226f6233d1896ad6d
+  metadata.gz: 6e43f5866c1d15d10020403671a88d02ec0d46ba99ff20d91ad1f910e6583bda24304550f6b1b2c5d3157b8fe0fae4df10a4d34a7f3667f0516699edd7a98d4a
+  data.tar.gz: 628b315e03a6a25752903d4638501889f957e14095a69825722cf97b1bfc3b9d233ad67c31d2dcb2e89885efa4d7709f1b580d05bdc99ebd524ced3935deaeb3

data/lib/nub/net.rb

@@ -146,7 +146,7 @@ module Net
   # Network object
   # @param subnet [String] of the network e.g. 192.168.100.0
   # @param cidr [String] of the network
-  # @param nic [String] to use for NAT etc...
+  # @param nic [String] to use for NAT, true pics primary
   # @param nameservers [Array[String]] to optionally use for new network else uses hosts
   Network = Struct.new(:subnet, :cidr, :nic, :nameservers)
 
@@ -161,6 +161,7 @@ module Net
   # @returns [Array] of name server ips
   def nameservers(*args)
     filename = args.any? ? args.first.to_s : '/etc/resolv.conf'
+    filename = '/etc/resolv.conf' if !File.file?(filename)
 
     result = []
     if File.file?(filename)
@@ -239,6 +240,7 @@ module Net
 
     # Pull from existing namespace first
     if self.namespaces.include?(namespace)
+      network.nameservers = self.nameservers("/etc/netns/#{namespace}/resolv.conf")
       host_veth, guest_veth = self.namespace_veths(namespace)
 
     # Handle args as either as positional or named
@@ -247,7 +249,7 @@ module Net
         network = args.first[:network] if args.first.key?(:network)
         host_veth = args.first[:host_veth] if args.first.key?(:host_veth)
         guest_veth = args.first[:guest_veth] if args.first.key?(:guest_veth)
-      elsif args.size > 1
+      elsif args.any?
         host_veth = args.shift
         guest_veth = args.shift if args.any?
         network = args.shift if args.any?
@@ -257,7 +259,9 @@ module Net
     # Populate missing information
     host_veth.name = "#{namespace}_host" if !host_veth.name
     guest_veth.name = "#{namespace}_guest" if !guest_veth.name
-    network.nic = self.primary_nic if network.nic == true
+    network.subnet = @@namespace_subnet if !network.subnet
+    network.cidr = @@namespace_cidr if !network.cidr
+    network.nic = self.primary_nic if network.nic.nil? || network.nic == true
     network.nameservers = self.nameservers if !network.nameservers
     if !host_veth.ip or !guest_veth.ip
       host_ip, guest_ip = self.namespace_next_veth_ips
@@ -278,7 +282,7 @@ module Net
   #   If the nic param is nil NAT is not enabled. If nic is true then the primary nic is dynamically
   #   looked up else use user given If nameservers are not given the host nameservers will be used
   def create_namespace(namespace, *args)
-    host_veth, guest_veth, network = self.namespace_details(namespace, args)
+    host_veth, guest_veth, network = self.namespace_details(namespace, *args)
 
     # Ensure namespace i.e. /var/run/netns/<namespace> exists
     if !self.namespaces.include?(namespace)
@@ -360,7 +364,7 @@ module Net
   #   If the nic param is nil NAT is not enabled. If nic is true then the primary nic is dynamically
   #   looked up else use user given If nameservers are not given the host nameservers will be used
   def delete_namespace(namespace, *args)
-    host_veth, guest_veth, network = self.namespace_details(namespace, args)
+    host_veth, guest_veth, network = self.namespace_details(namespace, *args)
 
     # Remove nameserver config for network namespace
     namespace_conf = File.join("/etc/netns", namespace)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.136
+  version: 0.0.138
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize