* Add Virtual Kubelet provider for VIC Initial virtual kubelet provider for VMware VIC. This provider currently handles creating and starting of a pod VM via the VIC portlayer and persona server. Image store handling via the VIC persona server. This provider currently requires the feature/wolfpack branch of VIC. * Added pod stop and delete. Also added node capacity. Added the ability to stop and delete pod VMs via VIC. Also retrieve node capacity information from the VCH. * Cleanup and readme file Some file clean up and added a Readme.md markdown file for the VIC provider. * Cleaned up errors, added function comments, moved operation code 1. Cleaned up error handling. Set standard for creating errors. 2. Added method prototype comments for all interface functions. 3. Moved PodCreator, PodStarter, PodStopper, and PodDeleter to a new folder. * Add mocking code and unit tests for podcache, podcreator, and podstarter Used the unit test framework used in VIC to handle assertions in the provider's unit test. Mocking code generated using OSS project mockery, which is compatible with the testify assertion framework. * Vendored packages for the VIC provider Requires feature/wolfpack branch of VIC and a few specific commit sha of projects used within VIC. * Implementation of POD Stopper and Deleter unit tests (#4) * Updated files for initial PR
104 lines
2.7 KiB
Go
104 lines
2.7 KiB
Go
package driverapi
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
|
|
"github.com/docker/libnetwork/types"
|
|
)
|
|
|
|
// MarshalJSON encodes IPAMData into json message
|
|
func (i *IPAMData) MarshalJSON() ([]byte, error) {
|
|
m := map[string]interface{}{}
|
|
m["AddressSpace"] = i.AddressSpace
|
|
if i.Pool != nil {
|
|
m["Pool"] = i.Pool.String()
|
|
}
|
|
if i.Gateway != nil {
|
|
m["Gateway"] = i.Gateway.String()
|
|
}
|
|
if i.AuxAddresses != nil {
|
|
am := make(map[string]string, len(i.AuxAddresses))
|
|
for k, v := range i.AuxAddresses {
|
|
am[k] = v.String()
|
|
}
|
|
m["AuxAddresses"] = am
|
|
}
|
|
return json.Marshal(m)
|
|
}
|
|
|
|
// UnmarshalJSON decodes a json message into IPAMData
|
|
func (i *IPAMData) UnmarshalJSON(data []byte) error {
|
|
var (
|
|
m map[string]interface{}
|
|
err error
|
|
)
|
|
if err := json.Unmarshal(data, &m); err != nil {
|
|
return err
|
|
}
|
|
i.AddressSpace = m["AddressSpace"].(string)
|
|
if v, ok := m["Pool"]; ok {
|
|
if i.Pool, err = types.ParseCIDR(v.(string)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if v, ok := m["Gateway"]; ok {
|
|
if i.Gateway, err = types.ParseCIDR(v.(string)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if v, ok := m["AuxAddresses"]; ok {
|
|
b, _ := json.Marshal(v)
|
|
var am map[string]string
|
|
if err = json.Unmarshal(b, &am); err != nil {
|
|
return err
|
|
}
|
|
i.AuxAddresses = make(map[string]*net.IPNet, len(am))
|
|
for k, v := range am {
|
|
if i.AuxAddresses[k], err = types.ParseCIDR(v); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Validate checks wheter the IPAMData structure contains congruent data
|
|
func (i *IPAMData) Validate() error {
|
|
var isV6 bool
|
|
if i.Pool == nil {
|
|
return types.BadRequestErrorf("invalid pool")
|
|
}
|
|
if i.Gateway == nil {
|
|
return types.BadRequestErrorf("invalid gateway address")
|
|
}
|
|
isV6 = i.IsV6()
|
|
if isV6 && i.Gateway.IP.To4() != nil || !isV6 && i.Gateway.IP.To4() == nil {
|
|
return types.BadRequestErrorf("incongruent ip versions for pool and gateway")
|
|
}
|
|
for k, sip := range i.AuxAddresses {
|
|
if isV6 && sip.IP.To4() != nil || !isV6 && sip.IP.To4() == nil {
|
|
return types.BadRequestErrorf("incongruent ip versions for pool and secondary ip address %s", k)
|
|
}
|
|
}
|
|
if !i.Pool.Contains(i.Gateway.IP) {
|
|
return types.BadRequestErrorf("invalid gateway address (%s) does not belong to the pool (%s)", i.Gateway, i.Pool)
|
|
}
|
|
for k, sip := range i.AuxAddresses {
|
|
if !i.Pool.Contains(sip.IP) {
|
|
return types.BadRequestErrorf("invalid secondary address %s (%s) does not belong to the pool (%s)", k, i.Gateway, i.Pool)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// IsV6 returns wheter this is an IPv6 IPAMData structure
|
|
func (i *IPAMData) IsV6() bool {
|
|
return nil == i.Pool.IP.To4()
|
|
}
|
|
|
|
func (i *IPAMData) String() string {
|
|
return fmt.Sprintf("AddressSpace: %s\nPool: %v\nGateway: %v\nAddresses: %v", i.AddressSpace, i.Pool, i.Gateway, i.AuxAddresses)
|
|
}
|