x
/
docker-machine-openstack
Code Issues Proposed changes

Merge pull request #2974 from robertjustjones/rackspace-net-switches 

Rackspace/Openstack - Add/enhance --*-net-* create switches.
This commit is contained in:
Nathan LeClaire 2016-02-25 16:20:07 -08:00
parent aaa4510ed9 c29d944831
commit feadca3ddf
2 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/openstack/client.go
View File

@ -41,7 +41,8 @@ type Client interface {
GetPublicKey(keyPairName string) ([]byte, error)
CreateKeyPair(d *Driver, name string, publicKey string) error
DeleteKeyPair(d *Driver, name string) error
GetNetworkID(d *Driver) (string, error)
GetNetworkIDs(d *Driver) ([]string, error)
GetNetworkID(d *Driver, networkName string) (string, error)
GetFlavorID(d *Driver) (string, error)
GetImageID(d *Driver) (string, error)
AssignFloatingIP(d *Driver, floatingIP *FloatingIP) error
@ -66,12 +67,12 @@ func (c *GenericClient) CreateInstance(d *Driver) (string, error) {
SecurityGroups: d.SecurityGroups,
AvailabilityZone: d.AvailabilityZone,
}
if d.NetworkId != "" {
serverOpts.Networks = []servers.Network{
{
UUID: d.NetworkId,
},
if len(d.NetworkIds) > 0 {
networks := make([]servers.Network, len(d.NetworkIds))
for i, networkId := range d.NetworkIds {
networks[i] = servers.Network{UUID: networkId}
}
serverOpts.Networks = networks
}
log.Info("Creating machine...")
@ -199,15 +200,23 @@ func (c *GenericClient) GetInstanceIPAddresses(d *Driver) ([]IPAddress, error) {
return addresses, nil
}
func (c *GenericClient) GetNetworkID(d *Driver) (string, error) {
return c.getNetworkID(d, d.NetworkName)
func (c *GenericClient) GetNetworkIDs(d *Driver) ([]string, error) {
networkIDs := make([]string, len(d.NetworkNames))
for i, networkName := range d.NetworkNames {
id, err := c.GetNetworkID(d, networkName)
if err != nil {
return nil, err
}
networkIDs[i] = id
}
return networkIDs, nil
}
func (c *GenericClient) GetFloatingIPPoolID(d *Driver) (string, error) {
return c.getNetworkID(d, d.FloatingIpPool)
return c.GetNetworkID(d, d.FloatingIPPool)
}
func (c *GenericClient) getNetworkID(d *Driver, networkName string) (string, error) {
func (c *GenericClient) GetNetworkID(d *Driver, networkName string) (string, error) {
opts := networks.ListOpts{Name: networkName}
pager := networks.List(c.Network, opts)
networkID := ""
@ -345,7 +354,7 @@ func (c *GenericClient) AssignFloatingIP(d *Driver, floatingIP *FloatingIP) erro
func (c *GenericClient) assignNovaFloatingIP(d *Driver, floatingIP *FloatingIP) error {
if floatingIP.Ip == "" {
f, err := compute_ips.Create(c.Compute, compute_ips.CreateOpts{
Pool: d.FloatingIpPool,
Pool: d.FloatingIPPool,
}).Extract()
if err != nil {
return err
@ -363,7 +372,7 @@ func (c *GenericClient) assignNeutronFloatingIP(d *Driver, floatingIP *FloatingI
}
if floatingIP.Id == "" {
f, err := floatingips.Create(c.Network, floatingips.CreateOpts{
FloatingNetworkID: d.FloatingIpPoolId,
FloatingNetworkID: d.FloatingIPPoolId,
PortID: portID,
}).Extract()
if err != nil {
@ -400,7 +409,7 @@ func (c *GenericClient) getNovaNetworkFloatingIPs(d *Driver) ([]FloatingIP, erro
ipListing, err := compute_ips.ExtractFloatingIPs(page)
for _, ip := range ipListing {
if ip.InstanceID == "" && ip.Pool == d.FloatingIpPool {
if ip.InstanceID == "" && ip.Pool == d.FloatingIPPool {
ips = append(ips, FloatingIP{
Id: ip.ID,
Ip: ip.IP,
@ -415,11 +424,11 @@ func (c *GenericClient) getNovaNetworkFloatingIPs(d *Driver) ([]FloatingIP, erro
func (c *GenericClient) getNeutronNetworkFloatingIPs(d *Driver) ([]FloatingIP, error) {
log.Debug("Listing floating IPs", map[string]string{
"FloatingNetworkId": d.FloatingIpPoolId,
"FloatingNetworkId": d.FloatingIPPoolId,
"TenantID": d.TenantId,
})
pager := floatingips.List(c.Network, floatingips.ListOpts{
FloatingNetworkID: d.FloatingIpPoolId,
FloatingNetworkID: d.FloatingIPPoolId,
TenantID: d.TenantId,
})
@ -449,7 +458,7 @@ func (c *GenericClient) getNeutronNetworkFloatingIPs(d *Driver) ([]FloatingIP, e
func (c *GenericClient) GetInstancePortID(d *Driver) (string, error) {
pager := ports.List(c.Network, ports.ListOpts{
DeviceID: d.MachineId,
NetworkID: d.NetworkId,
NetworkID: d.NetworkIds[0],
})
var portID string

76
drivers/openstack/openstack.go
View File

@ -35,13 +35,13 @@ type Driver struct {
ImageName string
ImageId string
KeyPairName string
NetworkName string
NetworkId string
NetworkNames []string
NetworkIds []string
PrivateKeyFile string
SecurityGroups []string
FloatingIpPool string
FloatingIPPool string
ComputeNetwork bool
FloatingIpPoolId string
FloatingIPPoolId string
IpVersion int
client Client
}
@ -149,22 +149,22 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
Usage: "OpenStack keypair to use to SSH to the instance",
Value: "",
},
mcnflag.StringFlag{
EnvVar: "OS_NETWORK_ID",
Name: "openstack-net-id",
Usage: "OpenStack network id the machine will be connected on",
Value: "",
},
mcnflag.StringFlag{
EnvVar: "OS_PRIVATE_KEY_FILE",
Name: "openstack-private-key-file",
Usage: "Private keyfile to use for SSH (absolute path)",
Value: "",
},
mcnflag.StringFlag{
EnvVar: "OS_NETWORK_ID",
Name: "openstack-net-id",
Usage: "OpenStack comma separated networks id the machine will be connected on",
Value: "",
},
mcnflag.StringFlag{
EnvVar: "OS_NETWORK_NAME",
Name: "openstack-net-name",
Usage: "OpenStack network name the machine will be connected on",
Usage: "OpenStack comma separated network names the machine will be connected on",
Value: "",
},
mcnflag.StringFlag{
@ -181,7 +181,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
mcnflag.StringFlag{
EnvVar: "OS_FLOATINGIP_POOL",
Name: "openstack-floatingip-pool",
Usage: "OpenStack floating IP pool to get an IP from to assign to the instance",
Usage: "OpenStack floating IP pool to get an IP from to assign to the instance (first network only)",
Value: "",
},
mcnflag.IntFlag{
@ -258,12 +258,16 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.FlavorName = flags.String("openstack-flavor-name")
d.ImageId = flags.String("openstack-image-id")
d.ImageName = flags.String("openstack-image-name")
d.NetworkId = flags.String("openstack-net-id")
d.NetworkName = flags.String("openstack-net-name")
if flags.String("openstack-net-id") != "" {
d.NetworkIds = strings.Split(flags.String("openstack-net-id"), ",")
}
if flags.String("openstack-net-name") != "" {
d.NetworkNames = strings.Split(flags.String("openstack-net-name"), ",")
}
if flags.String("openstack-sec-groups") != "" {
d.SecurityGroups = strings.Split(flags.String("openstack-sec-groups"), ",")
}
d.FloatingIpPool = flags.String("openstack-floatingip-pool")
d.FloatingIPPool = flags.String("openstack-floatingip-pool")
d.IpVersion = flags.Int("openstack-ip-version")
d.ComputeNetwork = flags.Bool("openstack-nova-network")
d.SSHUser = flags.String("openstack-ssh-user")
@ -303,7 +307,7 @@ func (d *Driver) GetIP() (string, error) {
}
addressType := Fixed
if d.FloatingIpPool != "" {
if d.FloatingIPPool != "" {
addressType = Floating
}
@ -376,7 +380,7 @@ func (d *Driver) Create() error {
if err := d.waitForInstanceActive(); err != nil {
return err
}
if d.FloatingIpPool != "" {
if d.FloatingIPPool != "" {
if err := d.assignFloatingIP(); err != nil {
return err
}
@ -473,8 +477,8 @@ func (d *Driver) checkConfig() error {
return fmt.Errorf(errorExclusiveOptions, "Image name", "Image id")
}
if d.NetworkName != "" && d.NetworkId != "" {
return fmt.Errorf(errorExclusiveOptions, "Network name", "Network id")
if len(d.NetworkNames) > 0 && len(d.NetworkIds) > 0 {
return fmt.Errorf(errorExclusiveOptions, "Network names", "Network ids")
}
if d.EndpointType != "" && (d.EndpointType != "publicURL" && d.EndpointType != "adminURL" && d.EndpointType != "internalURL") {
return fmt.Errorf(errorWrongEndpointType)
@ -486,26 +490,26 @@ func (d *Driver) checkConfig() error {
}
func (d *Driver) resolveIds() error {
if d.NetworkName != "" && !d.ComputeNetwork {
if len(d.NetworkNames) > 0 && !d.ComputeNetwork {
if err := d.initNetwork(); err != nil {
return err
}
networkID, err := d.client.GetNetworkID(d)
networkIds, err := d.client.GetNetworkIDs(d)
if err != nil {
return err
}
if networkID == "" {
return fmt.Errorf(errorUnknownNetworkName, d.NetworkName)
if len(networkIds) == 0 {
return fmt.Errorf(errorUnknownNetworkName, strings.Join(d.NetworkNames, ",")) // TODO specific name
}
d.NetworkId = networkID
log.Debug("Found network id using its name", map[string]string{
"Name": d.NetworkName,
"ID": d.NetworkId,
})
d.NetworkIds = networkIds
for i, networkName := range d.NetworkNames {
log.Debug("Found network id using its name", map[string]string{
"Name": networkName,
"ID": d.NetworkIds[i],
})
}
}
if d.FlavorName != "" {
@ -550,7 +554,7 @@ func (d *Driver) resolveIds() error {
})
}
if d.FloatingIpPool != "" && !d.ComputeNetwork {
if d.FloatingIPPool != "" && !d.ComputeNetwork {
if err := d.initNetwork(); err != nil {
return err
}
@ -561,13 +565,13 @@ func (d *Driver) resolveIds() error {
}
if f == "" {
return fmt.Errorf(errorUnknownNetworkName, d.FloatingIpPool)
return fmt.Errorf(errorUnknownNetworkName, d.FloatingIPPool)
}
d.FloatingIpPoolId = f
d.FloatingIPPoolId = f
log.Debug("Found floating IP pool id using its name", map[string]string{
"Name": d.FloatingIpPool,
"ID": d.FloatingIpPoolId,
"Name": d.FloatingIPPool,
"ID": d.FloatingIPPoolId,
})
}
@ -708,7 +712,7 @@ func (d *Driver) assignFloatingIP() error {
log.Debugf("Looking for an available floating IP", map[string]string{
"MachineId": d.MachineId,
"Pool": d.FloatingIpPool,
"Pool": d.FloatingIPPool,
})
for _, ip := range ips {