VMware vSphere Integrated Containers provider (#206)
* 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
This commit is contained in:
82
vendor/github.com/vmware/vic/lib/install/vchlog/buffered_pipe.go
generated
vendored
Normal file
82
vendor/github.com/vmware/vic/lib/install/vchlog/buffered_pipe.go
generated
vendored
Normal file
@@ -0,0 +1,82 @@
|
||||
// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package vchlog
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// BufferedPipe struct implements a pipe readwriter with buffer
|
||||
type BufferedPipe struct {
|
||||
// buffer: the internal buffer to hold data
|
||||
buffer *bytes.Buffer
|
||||
// c: the sync locker to manage concurrent reads and writes
|
||||
c *sync.Cond
|
||||
// writeClosed: boolean indicating if write end of the pipe is closed
|
||||
writeClosed bool
|
||||
}
|
||||
|
||||
// NewBufferedPipe returns a new buffered pipe instance
|
||||
// the internal buffer is initialized to default size.
|
||||
// Since internal memory is used, need to make sure that buffered data is bounded.
|
||||
func NewBufferedPipe() *BufferedPipe {
|
||||
var m sync.Mutex
|
||||
c := sync.NewCond(&m)
|
||||
return &BufferedPipe{
|
||||
buffer: bytes.NewBuffer(nil),
|
||||
c: c,
|
||||
writeClosed: false,
|
||||
}
|
||||
}
|
||||
|
||||
// Read is blocked until a writer in the queue is done writing (until data is available)
|
||||
func (bp *BufferedPipe) Read(data []byte) (n int, err error) {
|
||||
bp.c.L.Lock()
|
||||
defer bp.c.L.Unlock()
|
||||
defer bp.c.Broadcast()
|
||||
|
||||
for bp.buffer.Len() == 0 && !bp.writeClosed {
|
||||
bp.c.Wait()
|
||||
}
|
||||
if bp.buffer.Len() == 0 && bp.writeClosed {
|
||||
return 0, io.EOF
|
||||
}
|
||||
|
||||
return bp.buffer.Read(data)
|
||||
}
|
||||
|
||||
// Write writes to the internal buffer, and signals one of the reader in queue to start reading.
|
||||
func (bp *BufferedPipe) Write(data []byte) (n int, err error) {
|
||||
bp.c.L.Lock()
|
||||
defer bp.c.L.Unlock()
|
||||
defer bp.c.Broadcast()
|
||||
|
||||
if bp.writeClosed {
|
||||
return 0, io.ErrUnexpectedEOF
|
||||
}
|
||||
|
||||
return bp.buffer.Write(data)
|
||||
}
|
||||
|
||||
// Close closes the pipe
|
||||
func (bp *BufferedPipe) Close() (err error) {
|
||||
bp.c.L.Lock()
|
||||
defer bp.c.L.Unlock()
|
||||
defer bp.c.Broadcast()
|
||||
bp.writeClosed = true
|
||||
return nil
|
||||
}
|
||||
230
vendor/github.com/vmware/vic/lib/install/vchlog/buffered_pipe_test.go
generated
vendored
Normal file
230
vendor/github.com/vmware/vic/lib/install/vchlog/buffered_pipe_test.go
generated
vendored
Normal file
@@ -0,0 +1,230 @@
|
||||
// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package vchlog
|
||||
|
||||
import (
|
||||
. "io"
|
||||
"strconv"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
// Part 1. Test basic pipe functionality
|
||||
// (Referred to: https://golang.org/src/io/pipe_test.go)
|
||||
|
||||
// Test a single read and write
|
||||
func TestSingleReadWrite(t *testing.T) {
|
||||
testByte := []byte("hello world")
|
||||
toRead := make([]byte, 64)
|
||||
bp := NewBufferedPipe()
|
||||
writeDone := make(chan int)
|
||||
|
||||
// write to the pipe
|
||||
go write(t, bp, testByte, len(testByte), writeDone)
|
||||
|
||||
// read from the pipe
|
||||
read(t, bp, toRead, len(testByte), nil)
|
||||
assert.Equal(t, string(testByte), string(toRead[0:len(testByte)]),
|
||||
"expected %s, read %s", string(testByte), string(toRead[0:len(testByte)]))
|
||||
|
||||
<-writeDone
|
||||
bp.Close()
|
||||
}
|
||||
|
||||
// Test a sequence of reads and writes
|
||||
func readSequence(t *testing.T, r Reader, c chan int) {
|
||||
buf := make([]byte, 64)
|
||||
for {
|
||||
n, err := r.Read(buf)
|
||||
if err == EOF {
|
||||
c <- 0
|
||||
break
|
||||
}
|
||||
assert.Nil(t, err, "read error: %v", err)
|
||||
c <- n
|
||||
}
|
||||
}
|
||||
|
||||
func TestSequenceReadsWrites(t *testing.T) {
|
||||
readDone := make(chan int)
|
||||
bp := NewBufferedPipe()
|
||||
buf := make([]byte, 64)
|
||||
|
||||
// fire the reader
|
||||
go readSequence(t, bp, readDone)
|
||||
|
||||
// write to the pipe
|
||||
for i := 0; i < 5; i++ {
|
||||
l := 5 + i*10
|
||||
toWrite := buf[0:l]
|
||||
write(t, bp, toWrite, l, nil)
|
||||
|
||||
n := <-readDone
|
||||
assert.Equal(t, l, n, "wrote %d bytes, read %d bytes", l, n)
|
||||
}
|
||||
|
||||
bp.Close()
|
||||
n := <-readDone
|
||||
assert.Equal(t, 0, n, "final read should be 0, got %d", n)
|
||||
}
|
||||
|
||||
// Part 2. Test buffered pipe functionalities
|
||||
|
||||
// Test write buffering
|
||||
func TestWriteBuffering(t *testing.T) {
|
||||
bp := NewBufferedPipe()
|
||||
|
||||
// write first chunk of data
|
||||
firstChunk := make([]byte, 16)
|
||||
write(t, bp, firstChunk, len(firstChunk), nil)
|
||||
|
||||
// fire the reader
|
||||
readDone := make(chan int)
|
||||
go func() {
|
||||
buf := make([]byte, 64)
|
||||
for i := 0; i < 2; i++ {
|
||||
l := 8 * (i + 2)
|
||||
read(t, bp, buf, l, nil)
|
||||
}
|
||||
readDone <- 0
|
||||
}()
|
||||
|
||||
// sleep before the next write
|
||||
time.Sleep(time.Second * 5)
|
||||
|
||||
// write second chunk of data
|
||||
secondChunk := make([]byte, 24)
|
||||
write(t, bp, secondChunk, len(secondChunk), nil)
|
||||
|
||||
<-readDone
|
||||
bp.Close()
|
||||
}
|
||||
|
||||
// Test concurrent writers
|
||||
func writeSequence(t *testing.T, w Writer, l int, c chan int) {
|
||||
for i := 0; i < l; i++ {
|
||||
write(t, w, []byte(strconv.Itoa(i)), 1, nil)
|
||||
}
|
||||
time.Sleep(1 * time.Second)
|
||||
c <- 0
|
||||
}
|
||||
|
||||
func TestConcurrentWriter(t *testing.T) {
|
||||
bp := NewBufferedPipe()
|
||||
l := 10
|
||||
writersNum := 5
|
||||
total := writersNum * l
|
||||
|
||||
// fire 5 concurrent writers
|
||||
chans := make([]chan int, writersNum)
|
||||
for i := 0; i < writersNum; i++ {
|
||||
chans[i] = make(chan int)
|
||||
go writeSequence(t, bp, l, chans[i])
|
||||
}
|
||||
|
||||
// fire one concurrent reader
|
||||
finalLen := 0
|
||||
readDone := make(chan int)
|
||||
go func() {
|
||||
for {
|
||||
buf := make([]byte, 16)
|
||||
n, err := bp.Read(buf)
|
||||
if err == EOF {
|
||||
break
|
||||
}
|
||||
assert.Nil(t, err, "read error: %v", err)
|
||||
finalLen += n
|
||||
}
|
||||
readDone <- 0
|
||||
}()
|
||||
|
||||
// wait for writers to finish
|
||||
for i := 0; i < writersNum; i++ {
|
||||
<-chans[i]
|
||||
}
|
||||
bp.Close()
|
||||
|
||||
// check if the output has all the bytes
|
||||
<-readDone
|
||||
assert.Equal(t, total, finalLen,
|
||||
"%d concurrent writers wrote %d bytes total, got %d bytes", writersNum, total, finalLen)
|
||||
}
|
||||
|
||||
// Part 3. Edge cases
|
||||
|
||||
// Test read on closed pipe during read
|
||||
func delayClose(t *testing.T, cl Closer, c chan int) {
|
||||
time.Sleep(1 * time.Millisecond)
|
||||
err := cl.Close()
|
||||
assert.Nil(t, err, "close error: %v", err)
|
||||
c <- 0
|
||||
}
|
||||
|
||||
func TestPipeReadClose(t *testing.T) {
|
||||
bp := NewBufferedPipe()
|
||||
c := make(chan int)
|
||||
|
||||
// delay closer
|
||||
go delayClose(t, bp, c)
|
||||
|
||||
// read is expected to block until the pipe is closed
|
||||
buf := make([]byte, 64)
|
||||
n, err := bp.Read(buf)
|
||||
<-c
|
||||
|
||||
assert.Equal(t, EOF, err, "read from closed pipe: %v want %v", err, EOF)
|
||||
assert.Equal(t, 0, n, "read on closed pipe returned %d bytes", n)
|
||||
}
|
||||
|
||||
// Test write on closed pipe during write
|
||||
func TestPipeWriteClose(t *testing.T) {
|
||||
bp := NewBufferedPipe()
|
||||
|
||||
// close pipe
|
||||
bp.Close()
|
||||
|
||||
// write
|
||||
buf := make([]byte, 64)
|
||||
n, err := bp.Write(buf)
|
||||
|
||||
assert.Equal(t, ErrUnexpectedEOF, err, "write to closed pipe: %v want %v", err, ErrUnexpectedEOF)
|
||||
assert.Equal(t, 0, n, "write on closed pipe returned %d bytes", n)
|
||||
}
|
||||
|
||||
// Helper Functions
|
||||
|
||||
// write writes the data and report any error
|
||||
func write(t *testing.T, w Writer, data []byte, expected int, c chan int) {
|
||||
n, err := w.Write(data)
|
||||
assert.Nil(t, err, "write error: %v", err)
|
||||
assert.Equal(t, expected, n, "expected %d bytes, wrote %d", expected, n)
|
||||
|
||||
if c != nil {
|
||||
c <- 0
|
||||
}
|
||||
}
|
||||
|
||||
// read reads to buffer and report any error
|
||||
func read(t *testing.T, r Reader, buf []byte, expected int, c chan int) {
|
||||
n, err := r.Read(buf)
|
||||
assert.Nil(t, err, "read error: %v", err)
|
||||
assert.Equal(t, expected, n, "expected %d bytes, read %d", expected, n)
|
||||
|
||||
if c != nil {
|
||||
c <- 0
|
||||
}
|
||||
}
|
||||
103
vendor/github.com/vmware/vic/lib/install/vchlog/vchlogger.go
generated
vendored
Normal file
103
vendor/github.com/vmware/vic/lib/install/vchlog/vchlogger.go
generated
vendored
Normal file
@@ -0,0 +1,103 @@
|
||||
// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package vchlog
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"path"
|
||||
"time"
|
||||
|
||||
"github.com/vmware/govmomi/object"
|
||||
"github.com/vmware/govmomi/vim25/soap"
|
||||
"github.com/vmware/vic/pkg/trace"
|
||||
)
|
||||
|
||||
// Reminder: When changing these, consider the impact to backwards compatibility.
|
||||
const (
|
||||
LogFilePrefix = "vic-machine" // logFilePrefix is the prefix for file names of all vic-machine log files
|
||||
LogFileSuffix = ".log" // logFileSuffix is the suffix for file names of all vic-machine log files
|
||||
)
|
||||
|
||||
// DatastoreReadySignal serves as a signal struct indicating datastore folder path is available
|
||||
type DatastoreReadySignal struct {
|
||||
// Datastore: the govmomi datastore object
|
||||
Datastore *object.Datastore
|
||||
// Name: vic-machine process name (e.g. "create", "inspect")
|
||||
Name string
|
||||
// Operation: the operation from which the signal is sent
|
||||
Operation trace.Operation
|
||||
// VMPathName: the datastore path
|
||||
VMPathName string
|
||||
// Timestamp: timestamp at which the signal is sent
|
||||
Timestamp time.Time
|
||||
}
|
||||
|
||||
type VCHLogger struct {
|
||||
// pipe: the streaming readwriter pipe to hold log messages
|
||||
pipe *BufferedPipe
|
||||
|
||||
// signalChan: channel for signaling when datastore folder is ready
|
||||
signalChan chan DatastoreReadySignal
|
||||
|
||||
// done: channel indicating if streaming to datastore is finished
|
||||
done chan struct{}
|
||||
}
|
||||
|
||||
type Receiver interface {
|
||||
Signal(sig DatastoreReadySignal)
|
||||
}
|
||||
|
||||
// New creates the logger, with the streaming pipe and singaling channel.
|
||||
func New() *VCHLogger {
|
||||
return &VCHLogger{
|
||||
pipe: NewBufferedPipe(),
|
||||
signalChan: make(chan DatastoreReadySignal),
|
||||
done: make(chan struct{}),
|
||||
}
|
||||
}
|
||||
|
||||
// Run waits until the signal arrives and uploads the streaming pipe to datastore
|
||||
func (l *VCHLogger) Run() {
|
||||
sig := <-l.signalChan
|
||||
// suffix the log file name with caller operation ID and timestamp
|
||||
logFileName := LogFilePrefix + "_" + sig.Timestamp.UTC().Format(time.RFC3339) + "_" + sig.Name + "_" + sig.Operation.ID() + LogFileSuffix
|
||||
param := soap.DefaultUpload
|
||||
param.ContentLength = -1
|
||||
sig.Datastore.Upload(sig.Operation.Context, ioutil.NopCloser(l.pipe), path.Join(sig.VMPathName, logFileName), ¶m)
|
||||
close(l.done)
|
||||
}
|
||||
|
||||
// Wait waits for the streaming to VCH datastore to finish, or context times out
|
||||
func (l *VCHLogger) Wait(op trace.Operation) {
|
||||
select {
|
||||
case <-l.done: // done uploading to datastore (possibly error out)
|
||||
case <-op.Done(): // context cancel, timeout
|
||||
}
|
||||
}
|
||||
|
||||
// GetPipe returns the streaming pipe of the vch logger
|
||||
func (l *VCHLogger) GetPipe() *BufferedPipe {
|
||||
return l.pipe
|
||||
}
|
||||
|
||||
// Signal signals the logger that the datastore folder is ready
|
||||
func (l *VCHLogger) Signal(sig DatastoreReadySignal) {
|
||||
l.signalChan <- sig
|
||||
}
|
||||
|
||||
// Close stops the logger by closing the underlying pipe
|
||||
func (l *VCHLogger) Close() error {
|
||||
return l.pipe.Close()
|
||||
}
|
||||
Reference in New Issue
Block a user