train 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f666a5aa2bb040f3bc662ef2881d2a3778764cc9
-  data.tar.gz: 6e84e3102772ea858d8f4827f959e74f0d7a396f
+  metadata.gz: f63093de8fc4481a4c9138635607941fc2c58d79
+  data.tar.gz: 6cb07cade32d161a378fbd65e01deda7e6601b73
 SHA512:
-  metadata.gz: 376156ec17342f41fb82f5a1e8888e1c19b31f8760fd0ceaed4b664f68acf54c759129d3a458c0343c19d0925c70a09f715d1c8f18171d82b506c6ab331267f9
-  data.tar.gz: 5bce1e60af8264a419c68898e8efca072e0f5004313a9aabb1b83a978956618e21d6d3bc9de9ee848a93b482bfe6ec751d713bda18035074814b15294d5502da
+  metadata.gz: cc3669cede169bc9b1d6279ad131e6f530e5030f5eec62cff45fd3ed67db8fb9110c3290fc2da2cc0a60bfca8bd7a6f6e94139679e48b2e95833dac91bfa2d13
+  data.tar.gz: ea3b12df05af8e99a3999d379e67460f1d01f3c06217c6c4b2a28fc7e9e389319092c204ab5de0910a5c3f90aeb334657e421d73147bf02934ff3f96745a0874

data/CHANGELOG.md

@@ -1,7 +1,15 @@
 # Change Log
 
-## [1.4.0](https://github.com/chef/train/tree/1.4.0) (2018-04-12)
-[Full Changelog](https://github.com/chef/train/compare/v1.3.0...1.4.0)
+## [1.4.1](https://github.com/chef/train/tree/1.4.1) (2018-04-19)
+[Full Changelog](https://github.com/chef/train/compare/v1.4.0...1.4.1)
+
+**Merged pull requests:**
+
+- Add UUID for Cisco IOS and Nexus devices [\#285](https://github.com/chef/train/pull/285) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+- Add handling for privileged exec mode [\#284](https://github.com/chef/train/pull/284) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
+
+## [v1.4.0](https://github.com/chef/train/tree/v1.4.0) (2018-04-12)
+[Full Changelog](https://github.com/chef/train/compare/v1.3.0...v1.4.0)
 
 **Closed issues:**
 
@@ -9,6 +17,7 @@
 
 **Merged pull requests:**
 
+- Release 1.4.0 [\#282](https://github.com/chef/train/pull/282) ([jquick](https://github.com/jquick))
 - Add CloudLinux as a detected platform [\#281](https://github.com/chef/train/pull/281) ([tarcinil](https://github.com/tarcinil))
 - Move Cisco IOS connection under SSH transport [\#279](https://github.com/chef/train/pull/279) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Initialize FileManager using '@service' [\#278](https://github.com/chef/train/pull/278) ([marcparadise](https://github.com/marcparadise))

data/lib/train/platforms/detect/specifications/os.rb

@@ -555,6 +555,7 @@ module Train::Platforms::Detect::Specifications
             next unless v[:type] == 'nexus'
             @platform[:release] = v[:version]
             @platform[:arch] = nil
+            @platform[:uuid_command] = 'show inventory chassis | include SN'
             true
           }
 

data/lib/train/transports/cisco_ios_connection.rb

@@ -23,6 +23,13 @@ class Train::Transports::SSH
       "ssh://#{@user}@#{@host}:#{@port}"
     end
 
+    def unique_identifier
+      result = run_command_via_connection('show inventory').stdout
+      result.split("\r\n\r\n").each do |section|
+        return section.split('SN: ')[1].strip if section.include?('Chassis')
+      end
+    end
+
     private
 
     def establish_connection
@@ -38,7 +45,11 @@ class Train::Transports::SSH
 
       # Escalate privilege to enable mode if password is given
       if @enable_password
-        run_command_via_connection("enable\r\n#{@enable_password}")
+        # This verifies we are not in privileged exec mode before running the
+        # enable command. Otherwise, the password will be in history.
+        if run_command_via_connection('show privilege').stdout.split[-1] != '15'
+          run_command_via_connection("enable\r\n#{@enable_password}")
+        end
       end
 
       # Prevent `--MORE--` by removing terminal length limit

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

data/test/unit/transports/cisco_ios_connection.rb

@@ -31,6 +31,16 @@ describe 'CiscoIOSConnection' do
     end
   end
 
+  describe '#unique_identifier' do
+    it 'returns the correct identifier' do
+      output = "NAME: \"Chassis\", DESCR: \"Cisco 7206VXR, 6-slot chassis\"\r\nPID: CISCO7206VXR      , VID:    , SN: 4279256517 \r\n\r\nNAME: \"NPE400 0\", DESCR: \"Cisco 7200VXR Network Processing Engine NPE-400\"\r\nPID: NPE-400           , VID:    , SN: 11111111   \r\n\r\nNAME: \"module 0\", DESCR: \"I/O FastEthernet (TX-ISL)\"\r\nPID: C7200-IO-FE-MII/RJ45=, VID:    , SN: 4294967295 \r\n\r\nNAME: \"Power Supply 1\", DESCR: \"Cisco 7200 AC Power Supply\"\r\nPID: PWR-7200-AC       , VID:    , SN:            \r\n\r\nNAME: \"Power Supply 2\", DESCR: \"Cisco 7200 AC Power Supply\"\r\nPID: PWR-7200-AC       , VID:    , SN:            "
+      Train::Transports::SSH::CiscoIOSConnection.any_instance
+        .expects(:run_command_via_connection).with('show inventory')
+        .returns(OpenStruct.new(stdout: output))
+      connection.unique_identifier.must_equal('4279256517')
+    end
+  end
+
   describe '#format_result' do
     it 'returns correctly when result is `good`' do
       output = 'good'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-12 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json