Merge pull request #1070 from glennmatthews/FACT-1138

(FACT-1138) Improve os_family and release reporting for Cisco NX-OS

lib/inc/internal/facts/linux/os_cisco.hpp

@@ -15,7 +15,7 @@ namespace facter { namespace facts { namespace linux {
     {
         /**
          * Constructs the os_cisco and reads a release file to gather relevant details.
-         * @param file The release file to read for OS data.
+         * @param file The release file to read for Cisco-specific OS data.
          */
         os_cisco(std::string const& file) : os_linux({"ID", "ID_LIKE", "VERSION"}, file) {}
 
@@ -37,6 +37,25 @@ namespace facter { namespace facts { namespace linux {
          */
         virtual std::string get_family(std::string const& name) const override
         {
+            /*
+             * This benefits from some explanation.
+             * Some Cisco platforms have multiple runtime environments.
+             * For these platforms, the name reports as the same regardless of
+             * the environment (e.g., "nexus"), but we want the family to report
+             * appropriately according to the environment (e.g., "cisco-wrlinux"
+             * versus "RedHat").
+             *
+             * In order to achieve this goal, we first check to see what would
+             * be reported if we were a standard Linux environment (e.g., a
+             * Linux distro that detects its name as "centos" would map to
+             * family "RedHat"). Only if a standard Linux family is not
+             * detected do we fall back on the information given in our Cisco
+             * release info file.
+             */
+            auto value = os_linux::get_family(os_linux::get_name(""));
+            if (!value.empty()) {
+                return value;
+            }
             auto val = _release_info.find("ID_LIKE");
             return (val != _release_info.end()) ? val->second : std::string();
         }
@@ -56,13 +75,29 @@ namespace facter { namespace facts { namespace linux {
         /**
          * Parses the release version string to return the major version.
          * @param name Unused.
-         * @param release Unused.
-         * @return Returns a tuple of the major version and an empty string.
+         * @param release The release version determined using get_release.
+         * @return Returns a tuple of the major and minor versions.
          */
         virtual std::tuple<std::string, std::string> parse_release(std::string const& name, std::string const& release) const override
         {
-            auto pos = release.find('(');
-            return std::make_tuple(release.substr(0, pos), std::string());
+            /*
+             * Cisco software versions can be idiosyncratic.
+             * NX-OS looks something like '7.0(3)I2(0.455)'
+             * IOS XR looks something like '6.0.0.06I'
+             */
+            auto pos = release.find('.');
+            if (pos != std::string::npos) {
+                auto second = release.find('(', pos + 1);
+                if (second == std::string::npos) {
+                    second = release.find('.', pos + 1);
+                }
+                if (second == std::string::npos) {
+                    return std::make_tuple(release.substr(0, pos), std::string());
+                }
+                return std::make_tuple(release.substr(0, pos),
+                                       release.substr(pos + 1, second - (pos + 1)));
+            }
+            return std::make_tuple(release, std::string());
         }
     };
 

lib/inc/internal/facts/linux/release_file.hpp

@@ -50,6 +50,7 @@ namespace facter { namespace facts { namespace linux {
         /**
          * Release file for generic Linux distros.
          * Also used for:
+         * - Cisco
          * - CoreOS
          * - Cumulus
          */