Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(FACT-1710) Support zfs/zpool facts on FreeBSD #1595

Merged
merged 1 commit into from Jul 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/CMakeLists.txt
Expand Up @@ -203,6 +203,8 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
"src/facts/freebsd/dmi_resolver.cc"
"src/facts/freebsd/networking_resolver.cc"
"src/util/bsd/scoped_ifaddrs.cc"
"src/facts/freebsd/zfs_resolver.cc"
"src/facts/freebsd/zpool_resolver.cc"
)
elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "OpenBSD")
set(LIBFACTER_PLATFORM_SOURCES
Expand Down
24 changes: 24 additions & 0 deletions lib/inc/internal/facts/freebsd/zfs_resolver.hpp
@@ -0,0 +1,24 @@
/**
* @file
* Declares the ZFS fact resolver.
*/
#pragma once

#include "../resolvers/zfs_resolver.hpp"

namespace facter { namespace facts { namespace freebsd {

/**
* Responsible for resolving ZFS facts.
*/
struct zfs_resolver : resolvers::zfs_resolver
{
protected:
/**
* Gets the platform's ZFS command.
* @return Returns the platform's ZFS command.
*/
virtual std::string zfs_command();
};

}}} // namespace facter::facts::freebsd
24 changes: 24 additions & 0 deletions lib/inc/internal/facts/freebsd/zpool_resolver.hpp
@@ -0,0 +1,24 @@
/**
* @file
* Declares the FreeBSD ZFS storage pool (zpool) fact resolver.
*/
#pragma once

#include "../resolvers/zpool_resolver.hpp"

namespace facter { namespace facts { namespace freebsd {

/**
* Responsible for resolving ZFS storage pool (zpool) facts.
*/
struct zpool_resolver : resolvers::zpool_resolver
{
protected:
/**
* Gets the platform's zpool command.
* @return Returns the platform's zpool command.
*/
virtual std::string zpool_command();
};

}}} // namespace facter::facts::freebsd
4 changes: 4 additions & 0 deletions lib/src/facts/freebsd/collection.cc
Expand Up @@ -10,6 +10,8 @@
#include <internal/facts/posix/timezone_resolver.hpp>
#include <internal/facts/resolvers/operating_system_resolver.hpp>
#include <internal/facts/freebsd/networking_resolver.hpp>
#include <internal/facts/freebsd/zfs_resolver.hpp>
#include <internal/facts/freebsd/zpool_resolver.hpp>

using namespace std;

Expand All @@ -28,6 +30,8 @@ namespace facter { namespace facts {
add(make_shared<glib::load_average_resolver>());
add(make_shared<freebsd::processor_resolver>());
add(make_shared<freebsd::dmi_resolver>());
add(make_shared<freebsd::zfs_resolver>());
add(make_shared<freebsd::zpool_resolver>());
}

}} // namespace facter::facts
12 changes: 12 additions & 0 deletions lib/src/facts/freebsd/zfs_resolver.cc
@@ -0,0 +1,12 @@
#include <internal/facts/freebsd/zfs_resolver.hpp>

using namespace std;

namespace facter { namespace facts { namespace freebsd {

string zfs_resolver::zfs_command()
{
return "/sbin/zfs";
}

}}} // namespace facter::facts::freebsd
12 changes: 12 additions & 0 deletions lib/src/facts/freebsd/zpool_resolver.cc
@@ -0,0 +1,12 @@
#include <internal/facts/freebsd/zpool_resolver.hpp>

using namespace std;

namespace facter { namespace facts { namespace freebsd {

string zpool_resolver::zpool_command()
{
return "/sbin/zpool";
}

}}} // namespace facter::facts::freebsd