Merged in sdk_networking (pull request vchs#2)

Add classes for different network types

Author: dismir

lib/ruby_vcloud_sdk/client.rb

@@ -18,7 +18,7 @@ class Client
     public :vdcs, :list_vdcs, :find_vdc_by_name, :catalogs,
            :list_catalogs, :catalog_exists?, :find_catalog_by_name,
            :vdc_exists?, :vapps, :list_vapps, :find_vapp_by_name,
-           :vapp_exists?, :organizations, :roles, :entity
+           :vapp_exists?, :organizations, :roles, :entity, :networks
 
     def initialize(url, username, password, options = {}, logger = nil)
       @url = url
@@ -111,5 +111,10 @@ def vapp_template(id)
       vapp_template = connection.get("/api/vAppTemplate/#{id}")
       VCloudSdk::VappTemplate.new(@session, vapp_template)
     end
+
+    def network(id)
+      network = connection.get("/api/network/#{id}")
+      VCloudSdk::Network.new(@session, network.href)
+    end
   end
 end

lib/ruby_vcloud_sdk/infrastructure.rb

@@ -23,6 +23,15 @@ def vapps
       end
     end
 
+    def networks
+      networks_link = @session.query_list.networks_query_list
+      query_list = VCloudSdk::QueryList.new(@session, networks_link)
+
+      query_list.networks.map do |network_link|
+        VCloudSdk::Network.new(@session, network_link)
+      end
+    end
+
     def roles
       roles_link = @session.query_list.roles_query_list
       query_list = VCloudSdk::QueryList.new(@session, roles_link)

lib/ruby_vcloud_sdk/network.rb

@@ -25,6 +25,12 @@ def ip_ranges
         .reduce(IpRanges.new) do |result, i|
           result + IpRanges.new("#{i.start_address}-#{i.end_address}")
         end
+    rescue
+      nil
+    end
+
+    def href_id
+      entity_xml.href_id
     end
 
     def allocated_ips

lib/ruby_vcloud_sdk/nic.rb

@@ -4,21 +4,37 @@ class NIC
 
     def_delegators :@entity_xml,
                    :ip_address, :is_connected, :mac_address,
-                   :ip_address_allocation_mode, :network
+                   :ip_address_allocation_mode, :network, :element_name
 
     attr_reader :is_primary
 
-    def initialize(entity_xml, is_primary)
+    def initialize(entity_xml, is_primary, vm)
       @entity_xml = entity_xml
       @is_primary = is_primary
+      @vm = vm
     end
 
     def network_connection_index
       @entity_xml.network_connection_index.to_i
     end
 
-    def is_connected
-      @entity_xml.is_connected == "true"
+    def network_name
+      @entity_xml.network
+    end
+
+    def network
+      @vm.vapp.find_network_by_name(@entity_xml.network)
+    end
+
+    def to_hash
+      {
+        name: element_name,
+        mac_address: mac_address,
+        ip_address: ip_address,
+        network_identifier: network.try(:href_id),
+        is_primary: @is_primary,
+        is_connected: is_connected
+      }
     end
 
     alias_method :nic_index, :network_connection_index

lib/ruby_vcloud_sdk/organization.rb

@@ -35,6 +35,12 @@ def catalogs
       end
     end
 
+    def networks
+      entity_xml.networks.map do |network_link|
+        VCloudSdk::Network.new(@session, network_link)
+      end
+    end
+
     def to_hash
       { :identifier => id,
         :label      => @link.name }

lib/ruby_vcloud_sdk/query_list.rb

@@ -15,11 +15,14 @@ def initialize(session, link)
       @link = link
     end
 
-
     def vapps
       entity_xml.vapps
     end
 
+    def networks
+      entity_xml.networks
+    end
+
     def roles
       entity_xml.roles
     end

lib/ruby_vcloud_sdk/vapp.rb

@@ -173,6 +173,21 @@ def to_hash
         :memory_allocation_mb  => @link.memory_allocation_mb }
     end
 
+    def vdc
+      VCloudSdk::VDC.new(@session, entity_xml.vdc_link)
+    end
+
+    def find_network_by_name(network_name)
+      network_link = entity_xml.
+        network_config_section.
+        network_configs.
+        select { |vapp_network| vapp_network.network_name == network_name }.
+        first.try(:link)
+
+      return unless network_link
+      VCloudSdk::Network.new(@session, network_link)
+    end
+
     private
 
     def recompose_from_vapp_template_param(template)

lib/ruby_vcloud_sdk/vdc.rb

@@ -214,6 +214,10 @@ def storage_profile_xml_node(name)
       storage_profile
     end
 
+    def org
+      VCloudSdk::Organization.new(@session, entity_xml.org_link)
+    end
+
     private
 
     def storage_profile_records

lib/ruby_vcloud_sdk/vm.rb

@@ -130,16 +130,10 @@ def list_networks
     end
 
     def nics
-      primary_index = entity_xml
-                        .network_connection_section
-                        .primary_network_connection_index
       entity_xml
-        .network_connection_section
-        .network_connections
-        .map do |network_connection|
-          VCloudSdk::NIC.new(network_connection,
-                             network_connection.network_connection_index == primary_index)
-        end
+        .hardware_section
+        .nics
+        .map { |nic| VCloudSdk::NIC.new(nic, nic.is_primary, self) }
     end
 
     def independent_disks

lib/ruby_vcloud_sdk/xml/constants.rb

@@ -167,6 +167,8 @@ module Xml
           "application/vnd.vmware.vcloud.networkSection+xml",
         :NETWORK_CONFIG_SECTION =>
           "application/vnd.vmware.vcloud.networkConfigSection+xml",
+        :NETWORK_CARD_SECTION =>
+          "application/vnd.vmware.vcloud.networkConfigSection+xml",
         :PRODUCT_SECTIONS =>
           "application/vnd.vmware.vcloud.productSections+xml",
         :NETWORK_CONNECTION_SECTION =>