From 8f56f51bbb220341e7d1c0e93d6bd838ae97432e Mon Sep 17 00:00:00 2001
From: Dmitri Dolguikh <ddolguik@redhat.com>
Date: Thu, 4 Jan 2018 13:15:58 -0800
Subject: [PATCH] Merged pixicorev6 package into pixicore

---
 {pixiecorev6 => pixiecore}/boot_configuration.go | 2 +-
 pixiecore/cli/bootipv6cmd.go                     | 6 +++---
 pixiecore/cli/ipv6apicmd.go                      | 6 +++---
 {pixiecorev6 => pixiecore}/dhcpv6.go             | 2 +-
 {pixiecorev6 => pixiecore}/pixicorev6.go         | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename {pixiecorev6 => pixiecore}/boot_configuration.go (99%)
 rename {pixiecorev6 => pixiecore}/dhcpv6.go (98%)
 rename {pixiecorev6 => pixiecore}/pixicorev6.go (99%)

diff --git a/pixiecorev6/boot_configuration.go b/pixiecore/boot_configuration.go
similarity index 99%
rename from pixiecorev6/boot_configuration.go
rename to pixiecore/boot_configuration.go
index a109b3f..f692be0 100644
--- a/pixiecorev6/boot_configuration.go
+++ b/pixiecore/boot_configuration.go
@@ -1,4 +1,4 @@
-package pixiecorev6
+package pixiecore
 
 import (
 	"net/http"
diff --git a/pixiecore/cli/bootipv6cmd.go b/pixiecore/cli/bootipv6cmd.go
index b34420b..d1b6843 100644
--- a/pixiecore/cli/bootipv6cmd.go
+++ b/pixiecore/cli/bootipv6cmd.go
@@ -3,11 +3,11 @@ package cli
 import (
 	"github.com/spf13/cobra"
 	"fmt"
-	"go.universe.tf/netboot/pixiecorev6"
 	"go.universe.tf/netboot/dhcp6"
 	"go.universe.tf/netboot/dhcp6/pool"
 	"net"
 	"strings"
+	"go.universe.tf/netboot/pixiecore"
 )
 
 // pixiecore bootipv6 --listen-addr=2001:db8:f00f:cafe::4/64 --httpboot-url=http://[2001:db8:f00f:cafe::4]/bootx64.efi --ipxe-url=http://[2001:db8:f00f:cafe::4]/script.ipxe
@@ -28,7 +28,7 @@ var bootIPv6Cmd = &cobra.Command{
 			fatalf("Error reading flag: %s", err)
 		}
 
-		s := pixiecorev6.NewServerV6()
+		s := pixiecore.NewServerV6()
 
 		s.Log = logWithStdFmt
 		debug, err := cmd.Flags().GetBool("debug")
@@ -63,7 +63,7 @@ var bootIPv6Cmd = &cobra.Command{
 				dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress))
 			}
 		}
-		s.BootConfig = pixiecorev6.MakeStaticBootConfiguration(httpBootURL, ipxeURL, preference,
+		s.BootConfig = pixiecore.MakeStaticBootConfiguration(httpBootURL, ipxeURL, preference,
 			cmd.Flags().Changed("preference"), dnsServerAddresses)
 
 		addressPoolStart, err := cmd.Flags().GetString("address-pool-start")
diff --git a/pixiecore/cli/ipv6apicmd.go b/pixiecore/cli/ipv6apicmd.go
index 39f445b..3ed0479 100644
--- a/pixiecore/cli/ipv6apicmd.go
+++ b/pixiecore/cli/ipv6apicmd.go
@@ -3,12 +3,12 @@ package cli
 import (
 	"github.com/spf13/cobra"
 	"fmt"
-	"go.universe.tf/netboot/pixiecorev6"
 	"go.universe.tf/netboot/dhcp6"
 	"go.universe.tf/netboot/dhcp6/pool"
 	"time"
 	"net"
 	"strings"
+	"go.universe.tf/netboot/pixiecore"
 )
 
 // pixiecore ipv6api --listen-addr=2001:db8:f00f:cafe::4  --api-request-url=http://[2001:db8:f00f:cafe::4]:8888
@@ -30,7 +30,7 @@ var ipv6ApiCmd = &cobra.Command{
 			fatalf("Error reading flag: %s", err)
 		}
 
-		s := pixiecorev6.NewServerV6()
+		s := pixiecore.NewServerV6()
 		s.Log = logWithStdFmt
 		debug, err := cmd.Flags().GetBool("debug")
 		if err != nil {
@@ -60,7 +60,7 @@ var ipv6ApiCmd = &cobra.Command{
 				dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress))
 			}
 		}
-		s.BootConfig = pixiecorev6.MakeAPIBootConfiguration(apiURL, apiTimeout, preference,
+		s.BootConfig = pixiecore.MakeAPIBootConfiguration(apiURL, apiTimeout, preference,
 			cmd.Flags().Changed("preference"), dnsServerAddresses)
 
 		addressPoolStart, err := cmd.Flags().GetString("address-pool-start")
diff --git a/pixiecorev6/dhcpv6.go b/pixiecore/dhcpv6.go
similarity index 98%
rename from pixiecorev6/dhcpv6.go
rename to pixiecore/dhcpv6.go
index 57dee26..695c702 100644
--- a/pixiecorev6/dhcpv6.go
+++ b/pixiecore/dhcpv6.go
@@ -1,4 +1,4 @@
-package pixiecorev6
+package pixiecore
 
 import (
 	"go.universe.tf/netboot/dhcp6"
diff --git a/pixiecorev6/pixicorev6.go b/pixiecore/pixicorev6.go
similarity index 99%
rename from pixiecorev6/pixicorev6.go
rename to pixiecore/pixicorev6.go
index 1cdd93b..e266d03 100644
--- a/pixiecorev6/pixicorev6.go
+++ b/pixiecore/pixicorev6.go
@@ -1,4 +1,4 @@
-package pixiecorev6
+package pixiecore
 
 import (
 	"go.universe.tf/netboot/dhcp6"