mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp

pkg/baremetal/manager.go

@@ -30,7 +30,6 @@ import (
 	"yunion.io/x/onecloud/pkg/baremetal/utils/disktool"
 	"yunion.io/x/onecloud/pkg/baremetal/utils/ipmitool"
 	raiddrivers "yunion.io/x/onecloud/pkg/baremetal/utils/raid/drivers"
-	"yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
 	"yunion.io/x/onecloud/pkg/cloudcommon/sshkeys"
 	"yunion.io/x/onecloud/pkg/cloudcommon/types"
 	"yunion.io/x/onecloud/pkg/compute/baremetal"
@@ -39,6 +38,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/dhcp"
 	"yunion.io/x/onecloud/pkg/util/procutils"
 	"yunion.io/x/onecloud/pkg/util/ssh"
 )

pkg/baremetal/nic.go

@@ -10,8 +10,8 @@ import (
 	"yunion.io/x/pkg/util/netutils"
 
 	o "yunion.io/x/onecloud/pkg/baremetal/options"
-	"yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
 	"yunion.io/x/onecloud/pkg/cloudcommon/types"
+	"yunion.io/x/onecloud/pkg/util/dhcp"
 )
 
 func GetNicDHCPConfig(

pkg/baremetal/pxe/dhcp.go

@@ -9,10 +9,10 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	o "yunion.io/x/onecloud/pkg/baremetal/options"
-	"yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
 	"yunion.io/x/onecloud/pkg/cloudcommon/types"
 	"yunion.io/x/onecloud/pkg/compute/models"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/dhcp"
 )
 
 func (s *Server) serveDHCP(srv *dhcp.DHCPServer, handler dhcp.DHCPHandler) error {

pkg/baremetal/pxe/pxe.go

@@ -7,9 +7,9 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
-	"yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
 	"yunion.io/x/onecloud/pkg/cloudcommon/types"
 	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/util/dhcp"
 )
 
 const (

pkg/baremetal/pxe/tftp.go

@@ -12,7 +12,7 @@ import (
 
 	"yunion.io/x/log"
 
-	"yunion.io/x/onecloud/pkg/cloudcommon/tftp"
+	"yunion.io/x/onecloud/pkg/util/tftp"
 )
 
 var (

pkg/cloudcommon/tftp/doc.go

@@ -1 +0,0 @@
-package tftp // import "yunion.io/x/onecloud/pkg/cloudcommon/tftp"

pkg/hostman/hostinfo/hostdhcp/dhcprelay.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"yunion.io/x/log"
-	"yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
+	"yunion.io/x/onecloud/pkg/util/dhcp"
 )
 
 const DEFAULT_DHCP_RELAY_PORT = 68

pkg/hostman/hostinfo/hostdhcp/dhcpserver.go

@@ -9,10 +9,10 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/util/netutils"
 
-	"yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
 	"yunion.io/x/onecloud/pkg/cloudcommon/types"
 	"yunion.io/x/onecloud/pkg/hostman/guestman"
 	"yunion.io/x/onecloud/pkg/hostman/options"
+	"yunion.io/x/onecloud/pkg/util/dhcp"
 	"yunion.io/x/onecloud/pkg/util/netutils2"
 )
 

pkg/util/dhcp/doc.go

@@ -13,4 +13,4 @@
 // limitations under the License.
 
 // Package dhcp provides building blocks for DHCP clients and servers.
-package dhcp // import "yunion.io/x/onecloud/pkg/cloudcommon/dhcp"
+package dhcp // import "yunion.io/x/onecloud/pkg/util/dhcp"

pkg/util/tftp/doc.go

@@ -0,0 +1 @@
+package tftp // import "yunion.io/x/onecloud/pkg/util/tftp"