ipam/host-local: Move allocator and config to backend

Signed-off-by: André Martins <aanm90@gmail.com>

diff --git a/plugins/ipam/host-local/allocator.go b/plugins/ipam/host-local/backend/allocator/allocator.go
similarity index 99%
rename from plugins/ipam/host-local/allocator.go
rename to plugins/ipam/host-local/backend/allocator/allocator.go
index afb381f..6e18172 100644 (file)
--- a/plugins/ipam/host-local/allocator.go
+++ b/plugins/ipam/host-local/backend/allocator/allocator.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package allocator
 
 import (
        "fmt"

diff --git a/plugins/ipam/host-local/host_local_suite_test.go b/plugins/ipam/host-local/backend/allocator/allocator_suite_test.go
similarity index 88%
rename from plugins/ipam/host-local/host_local_suite_test.go
rename to plugins/ipam/host-local/backend/allocator/allocator_suite_test.go
index 4dc89a0..d98d856 100644 (file)
--- a/plugins/ipam/host-local/host_local_suite_test.go
+++ b/plugins/ipam/host-local/backend/allocator/allocator_suite_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main_test
+package allocator_test
 
 import (
        . "github.com/onsi/ginkgo"
@@ -21,7 +21,7 @@ import (
        "testing"
 )
 
-func TestHostLocal(t *testing.T) {
+func TestAllocator(t *testing.T) {
        RegisterFailHandler(Fail)
-       RunSpecs(t, "HostLocal Suite")
+       RunSpecs(t, "Allocator Suite")
 }

diff --git a/plugins/ipam/host-local/allocator_test.go b/plugins/ipam/host-local/backend/allocator/allocator_test.go
similarity index 99%
rename from plugins/ipam/host-local/allocator_test.go
rename to plugins/ipam/host-local/backend/allocator/allocator_test.go
index e1b19ee..44a60ba 100644 (file)
--- a/plugins/ipam/host-local/allocator_test.go
+++ b/plugins/ipam/host-local/backend/allocator/allocator_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package allocator
 
 import (
        "fmt"

diff --git a/plugins/ipam/host-local/config.go b/plugins/ipam/host-local/backend/allocator/config.go
similarity index 99%
rename from plugins/ipam/host-local/config.go
rename to plugins/ipam/host-local/backend/allocator/config.go
index 7c01a8c..6e5e4ab 100644 (file)
--- a/plugins/ipam/host-local/config.go
+++ b/plugins/ipam/host-local/backend/allocator/config.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package allocator
 
 import (
        "encoding/json"

diff --git a/plugins/ipam/host-local/main.go b/plugins/ipam/host-local/main.go
index 19a3180..330d9ac 100644 (file)
--- a/plugins/ipam/host-local/main.go
+++ b/plugins/ipam/host-local/main.go
@@ -15,6 +15,7 @@
 package main
 
 import (
+       "github.com/containernetworking/cni/plugins/ipam/host-local/backend/allocator"
        "github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk"
 
        "github.com/containernetworking/cni/pkg/skel"
@@ -27,7 +28,7 @@ func main() {
 }
 
 func cmdAdd(args *skel.CmdArgs) error {
-       ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
+       ipamConf, err := allocator.LoadIPAMConfig(args.StdinData, args.Args)
        if err != nil {
                return err
        }
@@ -38,7 +39,7 @@ func cmdAdd(args *skel.CmdArgs) error {
        }
        defer store.Close()
 
-       allocator, err := NewIPAllocator(ipamConf, store)
+       allocator, err := allocator.NewIPAllocator(ipamConf, store)
        if err != nil {
                return err
        }
@@ -55,7 +56,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 }
 
 func cmdDel(args *skel.CmdArgs) error {
-       ipamConf, err := LoadIPAMConfig(args.StdinData, args.Args)
+       ipamConf, err := allocator.LoadIPAMConfig(args.StdinData, args.Args)
        if err != nil {
                return err
        }
@@ -66,10 +67,10 @@ func cmdDel(args *skel.CmdArgs) error {
        }
        defer store.Close()
 
-       allocator, err := NewIPAllocator(ipamConf, store)
+       ipAllocator, err := allocator.NewIPAllocator(ipamConf, store)
        if err != nil {
                return err
        }
 
-       return allocator.Release(args.ContainerID)
+       return ipAllocator.Release(args.ContainerID)
 }

diff --git a/test b/test
index d32b134..cb10c4d 100755 (executable)
--- a/test
+++ b/test
@@ -11,7 +11,7 @@ set -e
 
 source ./build
 
-TESTABLE="libcni plugins/ipam/dhcp plugins/ipam/host-local plugins/main/loopback pkg/invoke pkg/ns pkg/skel pkg/types pkg/utils plugins/main/ipvlan plugins/main/macvlan plugins/main/bridge plugins/main/ptp plugins/test/noop pkg/utils/hwaddr pkg/ip pkg/version pkg/version/testhelpers plugins/meta/flannel"
+TESTABLE="libcni plugins/ipam/dhcp plugins/ipam/dhcp plugins/ipam/host-local/backend/allocator plugins/ipam/host-local/backend plugins/main/loopback pkg/invoke pkg/ns pkg/skel pkg/types pkg/utils plugins/main/ipvlan plugins/main/macvlan plugins/main/bridge plugins/main/ptp plugins/test/noop pkg/utils/hwaddr pkg/ip pkg/version pkg/version/testhelpers plugins/meta/flannel"
 FORMATTABLE="$TESTABLE pkg/testutils plugins/meta/flannel plugins/meta/tuning"
 
 # user has not provided PKG override