From 79d5e74ea90baa8b6ea1ee05cbe3579ff53d6435 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Tue, 12 Feb 2019 15:28:30 +0800 Subject: [PATCH] mv: pkg/cloudcommon/dhcp -> pkg/util/dhcp --- pkg/baremetal/manager.go | 2 +- pkg/baremetal/nic.go | 2 +- pkg/baremetal/pxe/dhcp.go | 2 +- pkg/baremetal/pxe/pxe.go | 2 +- pkg/baremetal/pxe/tftp.go | 2 +- pkg/cloudcommon/tftp/doc.go | 1 - pkg/hostman/hostinfo/hostdhcp/dhcprelay.go | 2 +- pkg/hostman/hostinfo/hostdhcp/dhcpserver.go | 2 +- pkg/{cloudcommon => util}/dhcp/conn.go | 0 pkg/{cloudcommon => util}/dhcp/conn_linux.go | 0 pkg/{cloudcommon => util}/dhcp/conn_test.go | 0 pkg/{cloudcommon => util}/dhcp/conn_unsupported.go | 0 pkg/{cloudcommon => util}/dhcp/doc.go | 2 +- pkg/{cloudcommon => util}/dhcp/helpers.go | 0 pkg/{cloudcommon => util}/dhcp/packet.go | 0 pkg/{cloudcommon => util}/dhcp/server.go | 0 pkg/util/tftp/doc.go | 1 + pkg/{cloudcommon => util}/tftp/tftp.go | 0 18 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 pkg/cloudcommon/tftp/doc.go rename pkg/{cloudcommon => util}/dhcp/conn.go (100%) rename pkg/{cloudcommon => util}/dhcp/conn_linux.go (100%) rename pkg/{cloudcommon => util}/dhcp/conn_test.go (100%) rename pkg/{cloudcommon => util}/dhcp/conn_unsupported.go (100%) rename pkg/{cloudcommon => util}/dhcp/doc.go (90%) rename pkg/{cloudcommon => util}/dhcp/helpers.go (100%) rename pkg/{cloudcommon => util}/dhcp/packet.go (100%) rename pkg/{cloudcommon => util}/dhcp/server.go (100%) create mode 100644 pkg/util/tftp/doc.go rename pkg/{cloudcommon => util}/tftp/tftp.go (100%) diff --git a/pkg/baremetal/manager.go b/pkg/baremetal/manager.go index b1d0b06ef4..d2b119eedd 100644 --- a/pkg/baremetal/manager.go +++ b/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" ) diff --git a/pkg/baremetal/nic.go b/pkg/baremetal/nic.go index 3aa4ec9241..7206d89827 100644 --- a/pkg/baremetal/nic.go +++ b/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( diff --git a/pkg/baremetal/pxe/dhcp.go b/pkg/baremetal/pxe/dhcp.go index 3bcbac1763..c4d0283324 100644 --- a/pkg/baremetal/pxe/dhcp.go +++ b/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 { diff --git a/pkg/baremetal/pxe/pxe.go b/pkg/baremetal/pxe/pxe.go index 82a7b7e1b8..d7e609c202 100644 --- a/pkg/baremetal/pxe/pxe.go +++ b/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 ( diff --git a/pkg/baremetal/pxe/tftp.go b/pkg/baremetal/pxe/tftp.go index c92c19aab0..894ef682ba 100644 --- a/pkg/baremetal/pxe/tftp.go +++ b/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 ( diff --git a/pkg/cloudcommon/tftp/doc.go b/pkg/cloudcommon/tftp/doc.go deleted file mode 100644 index e7d6a24323..0000000000 --- a/pkg/cloudcommon/tftp/doc.go +++ /dev/null @@ -1 +0,0 @@ -package tftp // import "yunion.io/x/onecloud/pkg/cloudcommon/tftp" diff --git a/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go b/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go index ec885b268a..d23358930c 100644 --- a/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go +++ b/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 diff --git a/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go b/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go index 923adc6e70..34fb6d8e3f 100644 --- a/pkg/hostman/hostinfo/hostdhcp/dhcpserver.go +++ b/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" ) diff --git a/pkg/cloudcommon/dhcp/conn.go b/pkg/util/dhcp/conn.go similarity index 100% rename from pkg/cloudcommon/dhcp/conn.go rename to pkg/util/dhcp/conn.go diff --git a/pkg/cloudcommon/dhcp/conn_linux.go b/pkg/util/dhcp/conn_linux.go similarity index 100% rename from pkg/cloudcommon/dhcp/conn_linux.go rename to pkg/util/dhcp/conn_linux.go diff --git a/pkg/cloudcommon/dhcp/conn_test.go b/pkg/util/dhcp/conn_test.go similarity index 100% rename from pkg/cloudcommon/dhcp/conn_test.go rename to pkg/util/dhcp/conn_test.go diff --git a/pkg/cloudcommon/dhcp/conn_unsupported.go b/pkg/util/dhcp/conn_unsupported.go similarity index 100% rename from pkg/cloudcommon/dhcp/conn_unsupported.go rename to pkg/util/dhcp/conn_unsupported.go diff --git a/pkg/cloudcommon/dhcp/doc.go b/pkg/util/dhcp/doc.go similarity index 90% rename from pkg/cloudcommon/dhcp/doc.go rename to pkg/util/dhcp/doc.go index 7d7b3ebc17..113b395e54 100644 --- a/pkg/cloudcommon/dhcp/doc.go +++ b/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" diff --git a/pkg/cloudcommon/dhcp/helpers.go b/pkg/util/dhcp/helpers.go similarity index 100% rename from pkg/cloudcommon/dhcp/helpers.go rename to pkg/util/dhcp/helpers.go diff --git a/pkg/cloudcommon/dhcp/packet.go b/pkg/util/dhcp/packet.go similarity index 100% rename from pkg/cloudcommon/dhcp/packet.go rename to pkg/util/dhcp/packet.go diff --git a/pkg/cloudcommon/dhcp/server.go b/pkg/util/dhcp/server.go similarity index 100% rename from pkg/cloudcommon/dhcp/server.go rename to pkg/util/dhcp/server.go diff --git a/pkg/util/tftp/doc.go b/pkg/util/tftp/doc.go new file mode 100644 index 0000000000..67120b2020 --- /dev/null +++ b/pkg/util/tftp/doc.go @@ -0,0 +1 @@ +package tftp // import "yunion.io/x/onecloud/pkg/util/tftp" diff --git a/pkg/cloudcommon/tftp/tftp.go b/pkg/util/tftp/tftp.go similarity index 100% rename from pkg/cloudcommon/tftp/tftp.go rename to pkg/util/tftp/tftp.go