From 9aec1d5ff278231454315410e50155e1fc33eada Mon Sep 17 00:00:00 2001
From: Onur Filiz <onur.filiz@microsoft.com>
Date: Tue, 1 Mar 2016 18:14:20 -0800
Subject: [PATCH] Task: 5544441 Refactor packaging for better testability

---
 ipam/{null/ipamNull.go => null.go} | 2 +-
 main.go                            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename ipam/{null/ipamNull.go => null.go} (99%)

diff --git a/ipam/null/ipamNull.go b/ipam/null.go
similarity index 99%
rename from ipam/null/ipamNull.go
rename to ipam/null.go
index 6de2bb586..8d760e9b8 100644
--- a/ipam/null/ipamNull.go
+++ b/ipam/null.go
@@ -1,7 +1,7 @@
 // Copyright Microsoft Corp.
 // All rights reserved.
 
-package ipamNull
+package ipam
 
 import (
 	"net/http"
diff --git a/main.go b/main.go
index 6d3e35f88..880aef2f2 100644
--- a/main.go
+++ b/main.go
@@ -9,7 +9,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	ipamNull "github.com/sharmasushant/penguin/ipam/null"
+	"github.com/sharmasushant/penguin/ipam"
 	"github.com/sharmasushant/penguin/log"
 	"github.com/sharmasushant/penguin/network"
 )
@@ -25,7 +25,7 @@ func printHelp() {
 
 func main() {
 	var netPlugin network.NetPlugin
-	var ipamPlugin ipamNull.IpamPlugin
+	var ipamPlugin ipam.IpamPlugin
 	var err error
 
 	// Set defaults.
@@ -53,7 +53,7 @@ func main() {
 			}
 
 		case "ipam":
-			ipamPlugin, err = ipamNull.NewPlugin(ipamVersion)
+			ipamPlugin, err = ipam.NewPlugin(ipamVersion)
 			if err != nil {
 				fmt.Printf("Failed to create IPAM plugin %v\n", err)
 				return