Skip to content

Commit 0aedfd2

Browse files
caglar10urcaglar10ur
committed
[vmwarevsphere] Start using govmomi provided helpers
Also update govmomi to latest revision and call Logout method when needed Signed-off-by: S.Çağlar Onur <conur@vmware.com>
1 parent 7f708ed commit 0aedfd2

File tree

268 files changed

+9861
-1619
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+9861
-1619
lines changed

‎Godeps/Godeps.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎drivers/vmwarevsphere/vsphere.go‎

Lines changed: 20 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ func (d *Driver) GetIP() (string, error) {
225225
if err != nil {
226226
return "", err
227227
}
228+
defer c.Logout(ctx)
228229

229230
vm, err := d.fetchVM(c, ctx, d.MachineName)
230231
if err != nil {
@@ -250,6 +251,7 @@ func (d *Driver) GetState() (state.State, error) {
250251
if err != nil {
251252
return state.None, err
252253
}
254+
defer c.Logout(ctx)
253255

254256
vm, err := d.fetchVM(c, ctx, d.MachineName)
255257
if err != nil {
@@ -284,26 +286,27 @@ func (d *Driver) PreCreateCheck() error {
284286
if err != nil {
285287
return err
286288
}
289+
defer c.Logout(ctx)
287290

288291
// Create a new finder
289292
f := find.NewFinder(c.Client, true)
290293

291-
dc, err := d.getDatacenter(f, ctx)
294+
dc, err := f.DatacenterOrDefault(ctx, d.Datacenter)
292295
if err != nil {
293296
return err
294297
}
295298

296299
f.SetDatacenter(dc)
297300

298-
if _, err := d.getDatastore(f, ctx); err != nil {
301+
if _, err := f.DatastoreOrDefault(ctx, d.Datastore); err != nil {
299302
return err
300303
}
301304

302-
if _, err := d.getNetwork(f, ctx); err != nil {
305+
if _, err := f.NetworkOrDefault(ctx, d.Network); err != nil {
303306
return err
304307
}
305308

306-
hs, err := d.getHostSystem(f, ctx)
309+
hs, err := f.HostSystemOrDefault(ctx, d.HostSystem)
307310
if err != nil {
308311
return err
309312
}
@@ -348,27 +351,29 @@ func (d *Driver) Create() error {
348351
if err != nil {
349352
return err
350353
}
354+
defer c.Logout(ctx)
355+
351356
// Create a new finder
352357
f := find.NewFinder(c.Client, true)
353358

354-
dc, err := d.getDatacenter(f, ctx)
359+
dc, err := f.DatacenterOrDefault(ctx, d.Datacenter)
355360
if err != nil {
356361
return err
357362
}
358363

359364
f.SetDatacenter(dc)
360365

361-
dss, err := d.getDatastore(f, ctx)
366+
dss, err := f.DatastoreOrDefault(ctx, d.Datastore)
362367
if err != nil {
363368
return err
364369
}
365370

366-
net, err := d.getNetwork(f, ctx)
371+
net, err := f.NetworkOrDefault(ctx, d.Network)
367372
if err != nil {
368373
return err
369374
}
370375

371-
hs, err := d.getHostSystem(f, ctx)
376+
hs, err := f.HostSystemOrDefault(ctx, d.HostSystem)
372377
if err != nil {
373378
return err
374379
}
@@ -558,6 +563,7 @@ func (d *Driver) Start() error {
558563
if err != nil {
559564
return err
560565
}
566+
defer c.Logout(ctx)
561567

562568
vm, err := d.fetchVM(c, ctx, d.MachineName)
563569
if err != nil {
@@ -590,6 +596,7 @@ func (d *Driver) Stop() error {
590596
if err != nil {
591597
return err
592598
}
599+
defer c.Logout(ctx)
593600

594601
vm, err := d.fetchVM(c, ctx, d.MachineName)
595602
if err != nil {
@@ -645,6 +652,7 @@ func (d *Driver) Kill() error {
645652
if err != nil {
646653
return err
647654
}
655+
defer c.Logout(ctx)
648656

649657
vm, err := d.fetchVM(c, ctx, d.MachineName)
650658
if err != nil {
@@ -683,18 +691,19 @@ func (d *Driver) Remove() error {
683691
if err != nil {
684692
return err
685693
}
694+
defer c.Logout(ctx)
686695

687696
// Create a new finder
688697
f := find.NewFinder(c.Client, true)
689698

690-
dc, err := d.getDatacenter(f, ctx)
699+
dc, err := f.DatacenterOrDefault(ctx, d.Datacenter)
691700
if err != nil {
692701
return err
693702
}
694703

695704
f.SetDatacenter(dc)
696705

697-
dss, err := d.getDatastore(f, ctx)
706+
dss, err := f.DatastoreOrDefault(ctx, d.Datastore)
698707
if err != nil {
699708
return err
700709
}
@@ -821,7 +830,7 @@ func (d *Driver) fetchVM(c *govmomi.Client, ctx context.Context, vmname string)
821830
var vm *object.VirtualMachine
822831
var err error
823832

824-
dc, err := d.getDatacenter(f, ctx)
833+
dc, err := f.DatacenterOrDefault(ctx, d.Datacenter)
825834
if err != nil {
826835
return vm, err
827836
}
@@ -856,83 +865,3 @@ func (f *FileAttrFlag) SetPerms(owner, group, perms int) {
856865
func (f *FileAttrFlag) Attr() types.BaseGuestFileAttributes {
857866
return &f.GuestPosixFileAttributes
858867
}
859-
860-
func (d *Driver) getDatacenter(f *find.Finder, ctx context.Context) (dc *object.Datacenter, err error) {
861-
862-
// Datacenter
863-
if d.Datacenter != "" {
864-
// Find specified Datacenter
865-
dc, err = f.Datacenter(ctx, d.Datacenter)
866-
if err != nil {
867-
return dc, err
868-
}
869-
} else {
870-
// Use default Datacenter
871-
dc, err = f.DefaultDatacenter(ctx)
872-
if err != nil {
873-
return dc, err
874-
}
875-
}
876-
log.Debug("Datacenter found: ", dc)
877-
return dc, nil
878-
}
879-
880-
func (d *Driver) getDatastore(f *find.Finder, ctx context.Context) (dss *object.Datastore, err error) {
881-
882-
// Datastore
883-
if d.Datastore != "" {
884-
// Find specified Datastore
885-
dss, err = f.Datastore(ctx, d.Datastore)
886-
if err != nil {
887-
return dss, err
888-
}
889-
} else {
890-
// Find default Datastore
891-
dss, err = f.DefaultDatastore(ctx)
892-
if err != nil {
893-
return dss, err
894-
}
895-
}
896-
log.Debug("Datastore found: ", dss)
897-
return dss, err
898-
}
899-
900-
func (d *Driver) getNetwork(f *find.Finder, ctx context.Context) (net object.NetworkReference, err error) {
901-
902-
// Network
903-
if d.Network != "" {
904-
// Find specified Network
905-
net, err = f.Network(ctx, d.Network)
906-
if err != nil {
907-
return net, err
908-
}
909-
} else {
910-
// Find default Network
911-
net, err = f.DefaultNetwork(ctx)
912-
if err != nil {
913-
return net, err
914-
}
915-
}
916-
log.Debug("Network found: ", net)
917-
return net, nil
918-
919-
}
920-
921-
func (d *Driver) getHostSystem(f *find.Finder, ctx context.Context) (hs *object.HostSystem, err error) {
922-
// HostSystem
923-
if d.HostSystem != "" {
924-
// Find specified HostSystem
925-
hs, err = f.HostSystem(ctx, d.HostSystem)
926-
if err != nil {
927-
return hs, err
928-
}
929-
} else {
930-
// Find default HostSystem
931-
hs, err = f.DefaultHostSystem(ctx)
932-
if err != nil {
933-
return hs, err
934-
}
935-
}
936-
log.Debug("HostSystem found: ", hs)
937-
return hs, nil
938-
}

‎vendor/github.com/vmware/govmomi/CHANGELOG.md‎

Lines changed: 27 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/vmware/govmomi/CONTRIBUTORS‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/vmware/govmomi/README.md‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/vmware/govmomi/client.go‎

Lines changed: 33 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/vmware/govmomi/event/history_collector.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)