nat-monitor 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3665bd673f7f721528355cfacc695941a2f98063
-  data.tar.gz: aa462845fffc6a241368013dc1b90b609bb3b1bd
+  metadata.gz: 536dfbc820599ad1fe2c10cfeffb86da7dcac84a
+  data.tar.gz: 045f897aec8ddd8bb83a58a540dbabab4812458f
 SHA512:
-  metadata.gz: f6bd6266e6104e3f42baea9a2c408ec45b9a714511cfc1263ae7f2937b26fdbb87c856817edc214d5f0a0ade6307e65190a1ccc457d6897e63dc0d40d9f5346a
-  data.tar.gz: 3c86db404315f8e6dfc0aeae92fd0ac9969b3823b258791913f24e2110fe198ba053eb93bf78e45e0b3ddfb0fe4aac47e6c0261546efa34d11767eab3d076db4
+  metadata.gz: f0726a3d02e59a92ac2775d0da561eb95490037ce89e3aeb33d99aff93f3fc5337ec4ec5148d86ed2fc23e19886e7962d2115f70de88f82cdf5934c6949c9229
+  data.tar.gz: 601a1532fc1707059f20bde496e5329694884d6cfa18a68ce64415d0a395b38234baaf8265d710a5cf78ce53eb164cdfd89af74ad350d659c9d35fc087f43eef

data/README.md

@@ -1,4 +1,4 @@
-# Nat::Monitor
+# nat-monitor
 
 Monitors a quorum of NAT servers for an outage and reassigns the specified EC2 route table to point to a working server.
 

data/lib/nat-monitor.rb

@@ -6,8 +6,11 @@ module EtTools
     require 'yaml'
 
     def initialize(conf_file = nil)
-      @conf = YAML.load_file(conf_file || '/etc/nat_monitor.yml')
-      @conf = defaults.merge @conf
+      @conf = defaults.merge load_conf(conf_file)
+    end
+
+    def load_conf(conf_file = nil)
+      YAML.load_file(conf_file || '/etc/nat_monitor.yml')
     end
 
     def run
@@ -58,6 +61,7 @@ module EtTools
     def steal_route
       output 'Stealing route 0.0.0.0/0 on route table ' \
              "#{@conf['route_table_id']}"
+      return if @conf['mocking']
       connection.replace_route(
         @conf['route_table_id'],
         '0.0.0.0/0',

data/lib/nat-monitor/version.rb

@@ -1,5 +1,5 @@
 module EtTools
   class NatMonitor
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/spec/lib/nat-monitor_spec.rb

@@ -16,8 +16,9 @@ describe EtTools::NatMonitor do
                    ).merge(@other_nodes) }
 
     filepath = 'bogus_filename.yml'
-    allow(YAML).to receive(:load_file).with(filepath)
-      .and_return(@yaml_conf)
+
+    allow_any_instance_of(EtTools::NatMonitor).to receive(:load_conf)
+      .with(filepath).and_return(@yaml_conf)
 
     @nat_monitor = EtTools::NatMonitor.new(filepath)
 
@@ -26,7 +27,6 @@ describe EtTools::NatMonitor do
                   'heartbeat_interval' => 10 }
 
     allow(@nat_monitor).to receive(:my_instance_id).and_return(@my_instance_id)
-    allow(@nat_monitor).to receive(:steal_route).and_return(true)
   end
 
   context 'fewer than 3 nodes are specified' do
@@ -48,9 +48,8 @@ describe EtTools::NatMonitor do
   end
 
   context 'invalid route is specified' do
-    # connection.route_tables.map(&:id).include? route_id
     before do
-      allow_any_instance_of(Fog::Compute::AWS).to receive(:route_tables)
+      expect(@nat_monitor.connection).to receive(:route_tables)
         .and_return [
           double('route_tables',
                  id: 'rtb-99999999')
@@ -58,8 +57,6 @@ describe EtTools::NatMonitor do
     end
 
     it 'exits with status 2' do
-      expect(@nat_monitor).to receive(:route_exists?).with(@route_table_id)
-        .and_return false
       expect(@nat_monitor).to receive(:exit).with(2)
       @nat_monitor.validate!
     end
@@ -129,8 +126,6 @@ describe EtTools::NatMonitor do
       end
 
       it 'counts unreachable nodes correctly' do
-        allow(@nat_monitor).to receive(:other_nodes)
-          .and_return(@other_nodes)
         expect(@nat_monitor).to receive(:unreachable_nodes)
           .and_return(@other_nodes)
         @nat_monitor.heartbeat
@@ -144,35 +139,53 @@ describe EtTools::NatMonitor do
       end
     end
 
-    context 'and can\'t ping the master' do
+    context 'and only can\'t ping the master' do
       before do
         allow(@nat_monitor).to receive(:pingable?).with('1.1.1.2')
           .and_return false
         allow(@nat_monitor).to receive(:pingable?).with('1.1.1.3')
           .and_return true
-        allow_any_instance_of(Fog::Compute::AWS).to receive(:replace_route)
-          .with(@route_table_id, '0.0.0.0', @my_instance_id)
-          .and_return true
       end
 
       it 'computes the list of other nodes correctly' do
+        allow(@nat_monitor).to receive(:steal_route).and_return true
         expect(@nat_monitor).to receive(:other_nodes)
           .exactly(2).times.and_return(@other_nodes)
         @nat_monitor.heartbeat
       end
 
       it 'finds i-00000002 unreachable' do
+        allow(@nat_monitor).to receive(:steal_route).and_return true
         expect(@nat_monitor).to receive(:unreachable_nodes)
           .and_return('i-00000002' => '1.1.1.2')
         @nat_monitor.heartbeat
       end
 
       it 'tries to steal the route' do
-        allow(@nat_monitor).to receive(:other_nodes)
-          .and_return(@other_nodes)
         expect(@nat_monitor).to receive(:steal_route)
         @nat_monitor.heartbeat
       end
+
+      it 'sends correct replace route command' do
+        expect(@nat_monitor.connection).to receive(:replace_route)
+          .with(@route_table_id, '0.0.0.0/0', @my_instance_id)
+          .and_return true
+        @nat_monitor.heartbeat
+      end
+    end
+
+    context 'mocking and can\'t ping the master' do
+      before do
+        @nat_monitor.instance_variable_set(
+          :@conf,
+          @yaml_conf.merge('mocking' => true).merge(@defaults)
+        )
+      end
+
+      it 'does not steal the route when mocking is enabled' do
+        expect(@nat_monitor.connection).to_not receive(:replace_route)
+        @nat_monitor.heartbeat
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nat-monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler