vm_shepherd 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c82c7eed07583a424d08e6842d8a9f2e45b20d4
-  data.tar.gz: 090fc9d93efdb780673d12029f51215f75fe261d
+  metadata.gz: 5e0041fdb5de68db4a89d35a6ac7d63c3527ee5e
+  data.tar.gz: 52c115a847e444db37c319fae1c3ce3fd0da8f94
 SHA512:
-  metadata.gz: 7ac89a80088fbea22fe0bfd0121ed26a38739c1c62e48bd7eed65b0d6c66db3b9737a72bb60f458cf9949ca812528495f672d85bb3f777a0eece4fe2d666a837
-  data.tar.gz: a3f96ba965202ea3ebf8a52e771424f33c4181d359ccb2ebb6a630f5d3592d0b078f783e067f6c9188627d8c4e14c78fc1ee1701e4e0f26a918f680db33cb0c0
+  metadata.gz: 77ee7563d67a92c965926d267764054427045c13b63e2af4a589f7e804f04ca742a4f002e96122c4a19a8077b23ab9f0dc13ecf65ab34f986e56cc0166f87a9c
+  data.tar.gz: 06e1848574c06035f8bf608fe4bba5f3c8fa2777e0bca913094c930cf323a10e527c7d423308157ca368a2dc1333bd5af33fdd9e2eeb65ee2b22c8d8a414e666

data/lib/vm_shepherd/shepherd.rb

@@ -136,6 +136,7 @@ module VmShepherd
         dns: vm.dns,
         ntp: vm.ntp,
         catalog: settings.vm_shepherd.vdc.catalog,
+        network: settings.vm_shepherd.vdc.network,
       }
     end
 

data/lib/vm_shepherd/vcloud_manager.rb

@@ -59,34 +59,43 @@ module VmShepherd
     end
 
     def deploy_vapp(ovf_dir, vapp_config)
+      vapp_name = vapp_config.fetch(:name)
+      catalog = vapp_config.fetch(:catalog)
+      network = vapp_config.fetch(:network)
       # setup the catalog
-      client.delete_catalog_by_name(vapp_config[:catalog]) if client.catalog_exists?(vapp_config[:catalog])
-      catalog = client.create_catalog(vapp_config[:catalog])
+      client.delete_catalog_by_name(catalog) if client.catalog_exists?(catalog)
+      catalog = client.create_catalog(catalog)
 
       # upload template and instantiate vapp
-      catalog.upload_vapp_template(@vdc_name, vapp_config[:name], ovf_dir)
+      catalog.upload_vapp_template(@vdc_name, vapp_name, ovf_dir)
 
       # instantiate template
-      network_config = VCloudSdk::NetworkConfig.new(vapp_config[:network], 'Network 1')
-      catalog.instantiate_vapp_template(
-        vapp_config[:name], @vdc_name, vapp_config[:name], nil, nil, network_config)
+      network_config = VCloudSdk::NetworkConfig.new(network, 'Network 1')
+      catalog.instantiate_vapp_template(vapp_name, @vdc_name, vapp_name, nil, nil, network_config)
     rescue => e
       @logger.error(e.http_body) if e.respond_to?(:http_body)
       raise e
     end
 
     def reconfigure_vm(vapp, vapp_config)
-      vm = vapp.find_vm_by_name(vapp_config[:name])
-      vm.product_section_properties = build_properties(vapp_config)
+      vapp_name = vapp_config.fetch(:name)
+      gateway = vapp_config.fetch(:gateway)
+      dns = vapp_config.fetch(:dns)
+      ntp = vapp_config.fetch(:ntp)
+      ip = vapp_config.fetch(:ip)
+      netmask = vapp_config.fetch(:netmask)
+
+      vm = vapp.find_vm_by_name(vapp_name)
+      vm.product_section_properties = build_properties(gateway: gateway, dns: dns, ntp: ntp, ip: ip, netmask: netmask)
       vm
     end
 
-    def build_properties(vapp_config)
+    def build_properties(gateway:, dns:, ntp:, ip:, netmask:)
       [
         {
           'type' => 'string',
           'key' => 'gateway',
-          'value' => vapp_config[:gateway],
+          'value' => gateway,
           'password' => 'false',
           'userConfigurable' => 'true',
           'Label' => 'Default Gateway',
@@ -95,7 +104,7 @@ module VmShepherd
         {
           'type' => 'string',
           'key' => 'DNS',
-          'value' => vapp_config[:dns],
+          'value' => dns,
           'password' => 'false',
           'userConfigurable' => 'true',
           'Label' => 'DNS',
@@ -104,7 +113,7 @@ module VmShepherd
         {
           'type' => 'string',
           'key' => 'ntp_servers',
-          'value' => vapp_config[:ntp],
+          'value' => ntp,
           'password' => 'false',
           'userConfigurable' => 'true',
           'Label' => 'NTP Servers',
@@ -122,7 +131,7 @@ module VmShepherd
         {
           'type' => 'string',
           'key' => 'ip0',
-          'value' => vapp_config[:ip],
+          'value' => ip,
           'password' => 'false',
           'userConfigurable' => 'true',
           'Label' => 'IP Address',
@@ -131,7 +140,7 @@ module VmShepherd
         {
           'type' => 'string',
           'key' => 'netmask0',
-          'value' => vapp_config[:netmask],
+          'value' => netmask,
           'password' => 'false',
           'userConfigurable' => 'true',
           'Label' => 'Netmask',

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

data/spec/vm_shepherd/shepherd_spec.rb

@@ -35,6 +35,7 @@ module VmShepherd
                 dns: settings.vm_shepherd.vapp.dns,
                 ntp: settings.vm_shepherd.vapp.ntp,
                 catalog: settings.vm_shepherd.vdc.catalog,
+                network: settings.vm_shepherd.vdc.network,
               }
             )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Ops Manager Team