Changed lib path to dev path for files in GIT

diff --git a/lib/UiO/SELF/DB.pm b/lib/UiO/SELF/DB.pm
index a4325c6e6331c6b0478953b505eb09485eb3d756..e9b92a57c51f81894590a7fd80871ee341d2c9b3 100644 (file)
--- a/lib/UiO/SELF/DB.pm
+++ b/lib/UiO/SELF/DB.pm
@@ -657,6 +657,7 @@ sub create_tables {
         where 
             server.guestid = guestos.osid
             and server.vlanid = network.vlanid 
+            and server.clid = network.clid 
             and server.tagid = vlantag.tagid
             and server.clid = cluster.clid
             and cluster.dcid = datacenter.dcid

diff --git a/lib/UiO/SELF/Vmwarecreate.pm b/lib/UiO/SELF/Vmwarecreate.pm
index d380d0e8e7cd373bc10d4f35852971dca3a82000..64efaa4717cb1a13fbbaca173339417c677922b7 100755 (executable)
--- a/lib/UiO/SELF/Vmwarecreate.pm
+++ b/lib/UiO/SELF/Vmwarecreate.pm
@@ -221,8 +221,11 @@ sub create_vm {
                             begin_entity => $cluster);
    my $minvms=999999999;
    my $targetNode;
+   $DB::single=1;
+   print "";
    foreach my $node (@{$nodes}) {
       my $running=0;
+      next if (ref ($node->vm) ne 'ARRAY');
       foreach my $vm (@{$node->vm}) {
         my $state=$vim->Vim::get_view( mo_ref =>$vm, properties => ['guest'] )->guest->guestState;
         $running++ if ($state eq "running");
@@ -347,6 +350,7 @@ sub create_vm {
 
 
    eval {
+      $DB::single=1;
       my $vm_status=$target_folder_view->CreateVM(
                              config => $vm_config_spec,
                              pool => $comp_res_view);