From 33e8afb29279a77d20dd94af6aa73c78c88cad89 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 15 Aug 2017 13:12:10 +0100 Subject: [PATCH] cmd: Use the proper packet.net go bindings again The support for always PXE has been merged. Signed-off-by: Rolf Neugebauer --- src/cmd/linuxkit/run_packet.go | 2 +- src/cmd/linuxkit/vendor.conf | 1 + .../{bzub => packethost}/packngo/LICENSE.txt | 0 .../{bzub => packethost}/packngo/README.md | 0 .../{bzub => packethost}/packngo/devices.go | 21 ++++++++++--------- .../{bzub => packethost}/packngo/email.go | 0 .../packngo/facilities.go | 0 .../{bzub => packethost}/packngo/ip.go | 0 .../packngo/operatingsystems.go | 0 .../{bzub => packethost}/packngo/packngo.go | 0 .../{bzub => packethost}/packngo/plans.go | 0 .../{bzub => packethost}/packngo/projects.go | 0 .../{bzub => packethost}/packngo/rate.go | 0 .../{bzub => packethost}/packngo/sshkeys.go | 0 .../{bzub => packethost}/packngo/timestamp.go | 0 .../{bzub => packethost}/packngo/user.go | 0 .../{bzub => packethost}/packngo/utils.go | 0 .../{bzub => packethost}/packngo/volumes.go | 0 18 files changed, 13 insertions(+), 11 deletions(-) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/LICENSE.txt (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/README.md (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/devices.go (90%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/email.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/facilities.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/ip.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/operatingsystems.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/packngo.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/plans.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/projects.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/rate.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/sshkeys.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/timestamp.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/user.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/utils.go (100%) rename src/cmd/linuxkit/vendor/github.com/{bzub => packethost}/packngo/volumes.go (100%) diff --git a/src/cmd/linuxkit/run_packet.go b/src/cmd/linuxkit/run_packet.go index 3aa0eff45..7c8b0d464 100644 --- a/src/cmd/linuxkit/run_packet.go +++ b/src/cmd/linuxkit/run_packet.go @@ -13,7 +13,7 @@ import ( "path/filepath" "strings" - "github.com/bzub/packngo" // TODO(rn): Update to official once iPXE is merged + "github.com/packethost/packngo" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" diff --git a/src/cmd/linuxkit/vendor.conf b/src/cmd/linuxkit/vendor.conf index 86941c2d7..ac3ed2b4b 100644 --- a/src/cmd/linuxkit/vendor.conf +++ b/src/cmd/linuxkit/vendor.conf @@ -13,6 +13,7 @@ github.com/gophercloud/gophercloud 2804b72cf099b41d2e25c8afcca786f9f962ddee github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062 github.com/moby/hyperkit a82b409a87f12fa3306813410c37f4eed270efac +github.com/packethost/packngo 9d9409c8c09de7695281e900a776cca03676026a github.com/radu-matei/azure-sdk-for-go 3b12823551999669c9a325a32472508e0af7978e github.com/radu-matei/azure-vhd-utils e52754d5569d2a643a7775f72ff2a6cf524f4c25 github.com/rn/iso9660wrap 4606f848a055435cdef85305960b0e1bb788d506 diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/LICENSE.txt b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/LICENSE.txt similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/LICENSE.txt rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/LICENSE.txt diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/README.md b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/README.md similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/README.md rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/README.md diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/devices.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/devices.go similarity index 90% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/devices.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/devices.go index a6552d5d5..a016f6757 100644 --- a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/devices.go +++ b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/devices.go @@ -48,16 +48,17 @@ func (d Device) String() string { // DeviceCreateRequest type used to create a Packet device type DeviceCreateRequest struct { - HostName string `json:"hostname"` - Plan string `json:"plan"` - Facility string `json:"facility"` - OS string `json:"operating_system"` - BillingCycle string `json:"billing_cycle"` - ProjectID string `json:"project_id"` - UserData string `json:"userdata"` - Tags []string `json:"tags"` - IPXEScriptUrl string `json:"ipxe_script_url,omitempty"` - AlwaysPXE bool `json:"always_pxe,omitempty"` + HostName string `json:"hostname"` + Plan string `json:"plan"` + Facility string `json:"facility"` + OS string `json:"operating_system"` + BillingCycle string `json:"billing_cycle"` + ProjectID string `json:"project_id"` + UserData string `json:"userdata"` + Tags []string `json:"tags"` + IPXEScriptUrl string `json:"ipxe_script_url,omitempty"` + PublicIPv4SubnetSize int `json:"public_ipv4_subnet_size,omitempty"` + AlwaysPXE bool `json:"always_pxe,omitempty"` } func (d DeviceCreateRequest) String() string { diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/email.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/email.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/email.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/email.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/facilities.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/facilities.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/facilities.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/facilities.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/ip.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/ip.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/ip.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/ip.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/operatingsystems.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/operatingsystems.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/operatingsystems.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/operatingsystems.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/packngo.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/packngo.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/packngo.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/packngo.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/plans.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/plans.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/plans.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/plans.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/projects.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/projects.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/projects.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/projects.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/rate.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/rate.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/rate.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/rate.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/sshkeys.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/sshkeys.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/sshkeys.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/sshkeys.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/timestamp.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/timestamp.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/timestamp.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/timestamp.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/user.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/user.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/user.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/user.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/utils.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/utils.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/utils.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/utils.go diff --git a/src/cmd/linuxkit/vendor/github.com/bzub/packngo/volumes.go b/src/cmd/linuxkit/vendor/github.com/packethost/packngo/volumes.go similarity index 100% rename from src/cmd/linuxkit/vendor/github.com/bzub/packngo/volumes.go rename to src/cmd/linuxkit/vendor/github.com/packethost/packngo/volumes.go