Skip to content

Commit

Permalink
vcsim: add ovf manager
Browse files Browse the repository at this point in the history
  • Loading branch information
dougm committed Apr 5, 2019
1 parent 7c1b2a9 commit 0b1ad55
Show file tree
Hide file tree
Showing 11 changed files with 564 additions and 26 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ go-test:
GORACE=history_size=5 $(GO) test -timeout 5m -count 1 -race -v $(TEST_OPTS) ./...

govc-test: install
./govc/test/images/update.sh
(cd govc/test && ./vendor/github.com/sstephenson/bats/libexec/bats -t .)

.PHONY: test
Expand Down
21 changes: 15 additions & 6 deletions govc/test/import.bats
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,31 @@
load test_helper

@test "import.ova" {
esx_env
vcsim_env

run govc import.ova $GOVC_IMAGES/${TTYLINUX_NAME}.ova
run govc import.ova "$GOVC_IMAGES/$TTYLINUX_NAME.ova"
assert_success

run govc vm.destroy ${TTYLINUX_NAME}
run govc device.ls -vm "$TTYLINUX_NAME"
assert_success
assert_matches "disk-"

run govc vm.destroy "$TTYLINUX_NAME"
assert_success
}

@test "import.ova with iso" {
esx_env
vcsim_env

run govc import.ova "$GOVC_IMAGES/${TTYLINUX_NAME}-live.ova"
assert_success

run govc import.ova $GOVC_IMAGES/${TTYLINUX_NAME}-live.ova
run govc device.ls -vm "${TTYLINUX_NAME}-live"
assert_success
assert_matches "disk-"
assert_matches "cdrom-.* ${TTYLINUX_NAME}-live/_deviceImage0.iso"

run govc vm.destroy ${TTYLINUX_NAME}-live
run govc vm.destroy "${TTYLINUX_NAME}-live"
assert_success
}

Expand Down
10 changes: 10 additions & 0 deletions govc/test/library.bats
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,13 @@ load test_helper
run govc library.item.rm my-content library.bats
assert_success
}

@test "library.deploy" {
vcsim_env

run govc library.create my-content
assert_success

run govc library.ova my-content "$GOVC_IMAGES/${TTYLINUX_NAME}.ova"
assert_success
}
4 changes: 3 additions & 1 deletion object/virtual_device_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,10 @@ func (l VirtualDeviceList) FindSCSIController(name string) (*types.VirtualSCSICo
func (l VirtualDeviceList) CreateSCSIController(name string) (types.BaseVirtualDevice, error) {
ctypes := SCSIControllerTypes()

if name == "scsi" || name == "" {
if name == "" || name == "scsi" {
name = ctypes.Type(ctypes[0])
} else if name == "virtualscsi" {
name = "pvscsi" // ovf VirtualSCSI mapping
}

found := ctypes.Select(func(device types.BaseVirtualDevice) bool {
Expand Down
137 changes: 137 additions & 0 deletions simulator/http_nfc_lease.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
/*
Copyright (c) 2019 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 simulator

import (
"fmt"
"io"
"io/ioutil"
"log"
"net/http"
"os"
"strings"
"sync"

"github.com/vmware/govmomi/vim25/methods"
"github.com/vmware/govmomi/vim25/mo"
"github.com/vmware/govmomi/vim25/soap"
"github.com/vmware/govmomi/vim25/types"
)

type HttpNfcLease struct {
mo.HttpNfcLease
files map[string]string
}

var (
nfcLease sync.Map // HTTP access to NFC leases are token based and do not require Session auth
nfcPrefix = "/nfc/"
)

// ServeNFC handles NFC file upload/download
func ServeNFC(w http.ResponseWriter, r *http.Request) {
p := strings.Split(r.URL.Path, "/")
id, name := p[len(p)-2], p[len(p)-1]
ref := types.ManagedObjectReference{Type: "HttpNfcLease", Value: id}
l, ok := nfcLease.Load(ref)
if !ok {
log.Printf("invalid NFC lease: %s", id)
http.NotFound(w, r)
return
}
lease := l.(*HttpNfcLease)
file, ok := lease.files[name]
if !ok {
log.Printf("invalid NFC device id: %s", name)
http.NotFound(w, r)
return
}

status := http.StatusOK
var dst io.Writer
var src io.ReadCloser

switch r.Method {
case http.MethodPut, http.MethodPost:
dst = ioutil.Discard
src = r.Body
case http.MethodGet:
f, err := os.Open(file)
if err != nil {
http.NotFound(w, r)
return
}
src = f
default:
status = http.StatusMethodNotAllowed
}

n, err := io.Copy(dst, src)
_ = src.Close()

msg := fmt.Sprintf("transferred %d bytes", n)
if err != nil {
status = http.StatusInternalServerError
msg = err.Error()
}
log.Printf("nfc %s %s: %s", r.Method, file, msg)
w.WriteHeader(status)
}

func NewHttpNfcLease(ctx *Context, entity types.ManagedObjectReference) *HttpNfcLease {
lease := &HttpNfcLease{
HttpNfcLease: mo.HttpNfcLease{
Info: &types.HttpNfcLeaseInfo{
Entity: entity,
LeaseTimeout: 30000,
},
State: types.HttpNfcLeaseStateReady,
},
files: make(map[string]string),
}

ctx.Session.Put(lease)
nfcLease.Store(lease.Reference(), lease)

return lease
}

func (l *HttpNfcLease) HttpNfcLeaseComplete(ctx *Context, req *types.HttpNfcLeaseComplete) soap.HasFault {
ctx.Session.Remove(req.This)
nfcLease.Delete(req.This)

return &methods.HttpNfcLeaseCompleteBody{
Res: new(types.HttpNfcLeaseCompleteResponse),
}
}

func (l *HttpNfcLease) HttpNfcLeaseAbort(ctx *Context, req *types.HttpNfcLeaseAbort) soap.HasFault {
ctx.Session.Remove(req.This)
nfcLease.Delete(req.This)

return &methods.HttpNfcLeaseAbortBody{
Res: new(types.HttpNfcLeaseAbortResponse),
}
}

func (l *HttpNfcLease) HttpNfcLeaseProgress(ctx *Context, req *types.HttpNfcLeaseProgress) soap.HasFault {
l.TransferProgress = req.Percent

return &methods.HttpNfcLeaseProgressBody{
Res: new(types.HttpNfcLeaseProgressResponse),
}
}
Loading

0 comments on commit 0b1ad55

Please sign in to comment.