foreman_cpp_cloudstack 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14088e20f875549969b36bad16706366ccc41961
-  data.tar.gz: 89c07516d3a2a5f11f2e5fd320f7b02b6587cd91
+  metadata.gz: 70859d39233ad364b9c6c7f47474a72b0228c389
+  data.tar.gz: 618cd5e4e7f4ace2e515ce45723662468c78f20a
 SHA512:
-  metadata.gz: c38c9cde889163aa86cee0c674619437f20c3f591f7a43c305b0038c794bed5f139bc16b86d6e7bdeb7a952709d452d7f4d0b5695a7211d60fea6011ac185fcd
-  data.tar.gz: 88071ed5f6b04c5804ccd8f85597d7d810a729068087962f0eca0ad7f5c38b0763ebf3ef1d39f28ef54661760be6a24b2610d6a0aa6b8930ef83273896e54119
+  metadata.gz: a69fe60d56d3cfd516d51d0e36ed0bb48f4d9b712da06766ab4e42ba50dd09a97b1537f47a7b3294940bdf6fd68630f7afd90eae2359ee598ae03b4fb1bacf0a
+  data.tar.gz: f4c80196876a69a958f2f08bdf4fc9ff8d944d9a690028457144ac19aa5fa90ceea24ad64855166500d25ffbad5bb95cf114ea9484d196a65bce2e3021bb9828

data/app/models/concerns/fog_extensions/cloudstack/server.rb

@@ -20,21 +20,21 @@ module FogExtensions
 				name
 			end
 
-                        def ip_address
-				logger.info "BG inspect nics:"
-				logger.info nics.inspect
-                                return nics[0]["ipaddress"]
-                        end
-
-			def test_method
-                                nics[0]["ipaddress"]
-			end
+            def ip_address
+                nics[0]["ipaddress"]
+            end
+
+            def ip_addresses
+                nics.map { |n| n.ipaddress }
+            end
+
+            def mac_address
+                nics[0]["macaddress"]
+            end
 
-                        def ip_addresses
-				logger.info "BG inspect nics:"
-				logger.info nics.inspect 
-                                nics.map { |n| n.ipaddress } 
-                        end
+            def mac_addresses
+                nics.map { |n| n.macaddress }
+            end
 
 			def start
 				if state.downcase == 'paused'

data/app/models/foreman_cpp_cloudstack/cloudstack.rb

@@ -119,7 +119,7 @@ module ForemanCPPCloudstack
         end
 
         def provided_attributes
-            super.merge({ :ip => :test_method })
+            super.merge({ :ip => :ip_address, :mac => :mac_address })
         end
 
         def self.model_name

data/app/views/compute_resources_vms/show/_cloudstack.html.erb

@@ -4,12 +4,6 @@
     <tr><th colspan="2">Properties</th></tr>
 
     <%= prop :availability_zone %>
-    <% @vm.all_addresses.each do |address| %>
-      <tr>
-        <td><%= address["pool"] %> network</td>
-        <td><%= address["ip"] %> (floating), <%= address["fixed_ip"] %> (fixed ip) </td>
-      </tr>
-    <% end %>
     <%= prop :state %>
     <%= prop :created_at %>
     <%= prop :flavor_with_object, "Flavor" %>

data/lib/foreman_cpp_cloudstack/version.rb

@@ -7,5 +7,5 @@
 ###########################################################################
 
 module ForemanCPPCloudstack
-	VERSION = "0.1.6"
+	VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_cpp_cloudstack
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - bytemine GmbH, Daniel Rauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake