From 835b2041ee7987b4482927a6ae6b0ee79156baf8 Mon Sep 17 00:00:00 2001 From: Chris Bednarski Date: Fri, 30 Oct 2015 16:48:02 -0700 Subject: [PATCH] Use the same network fingerprinter for *nix and windows --- .../{network_unix.go => network.go} | 2 -- client/fingerprint/network_windows.go | 27 ------------------- 2 files changed, 29 deletions(-) rename client/fingerprint/{network_unix.go => network.go} (99%) delete mode 100644 client/fingerprint/network_windows.go diff --git a/client/fingerprint/network_unix.go b/client/fingerprint/network.go similarity index 99% rename from client/fingerprint/network_unix.go rename to client/fingerprint/network.go index 4278384e9..593f7b790 100644 --- a/client/fingerprint/network_unix.go +++ b/client/fingerprint/network.go @@ -1,5 +1,3 @@ -// +build linux darwin - package fingerprint import ( diff --git a/client/fingerprint/network_windows.go b/client/fingerprint/network_windows.go deleted file mode 100644 index 99467bcc8..000000000 --- a/client/fingerprint/network_windows.go +++ /dev/null @@ -1,27 +0,0 @@ -// +build windows - -package fingerprint - -import ( - "log" - - "github.com/hashicorp/nomad/client/config" - "github.com/hashicorp/nomad/nomad/structs" -) - -// NetworkFingerprint is used to fingerprint the Network capabilities of a node -type NetworkFingerprint struct { - logger *log.Logger -} - -// NewNetworkFingerprint returns a new NetworkFingerprinter with the given -// logger -func NewNetworkFingerprinter(logger *log.Logger) Fingerprint { - f := &NetworkFingerprint{logger: logger} - return f -} - -func (f *NetworkFingerprint) Fingerprint(cfg *config.Config, node *structs.Node) (bool, error) { - // return false, because we don't yet support Windows - return false, nil -}