Merge pull request #155 from HewlettPackard/enhancement/support-compa…

…ct-syntax-for-synergy-qports

Fixed #148

CHANGELOG.md

@@ -1,13 +1,14 @@
-# Unreleased Changes
-
-## Suggested release: v2.2.1
+# v2.2.1 (2017-05-22)
 ### Version highlights:
 1. Major refactor on internal methods. Improved idempotency, logging project-wide and reduced lines of code count.
+2. Raised 'oneview-sdk' version used to ~> 4.4.
+3. Several bugfixes and improvements.
 
 #### Bug fixes & Enhancements:
 - [#95](https://github.com/HewlettPackard/oneview-puppet/issues/95) Improve server profile idempotency
 - [#101](https://github.com/HewlettPackard/oneview-puppet/issues/101) Improve server profile template idempotency
 - [#145](https://github.com/HewlettPackard/oneview-puppet/issues/145) Refactor oneview_resource class and common for v2.2.0
+- [#148](https://github.com/HewlettPackard/oneview-puppet/issues/148) Cannot create uplinkset for LIG on a Synergy frame
 - [#149](https://github.com/HewlettPackard/oneview-puppet/issues/149) Server Profile - Network uris set inside the connections return error
 - [#151](https://github.com/HewlettPackard/oneview-puppet/issues/151) SAS Logical Interconnect Group - Name to URI conversion fails on logicalInterconnectGroupUri fields
 - [#153](https://github.com/HewlettPackard/oneview-puppet/issues/153) Idempotence error: Running a ensure => 'present' on a oneview_firmware_bundle resource

Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'coveralls', require: false
 gem 'facter', '>= 1.7.0'
 gem 'metadata-json-lint'
-gem 'oneview-sdk', '~> 4.2'
+gem 'oneview-sdk', '~> 4.4'
 gem 'pry'
 gem 'puppet', '>= 4.1'
 gem 'puppet-lint', '>= 0.3.2'

examples/logical_interconnect_group_synergy.pp

@@ -14,23 +14,61 @@
 # limitations under the License.
 ################################################################################
 
-# The Interconnects and Uplink Sets can also be declared as follows:
-oneview_logical_interconnect_group{'Puppet Ethernet LIG Synergy':
+# This sample creates a complex LIG with an Uplink and Interconnect using 2 enclosures.
+# If no enclosure_index is provided for interconnects, a value of '1' is assumed.
+$interconnect_type_1 = 'Virtual Connect SE 40Gb F8 Module for Synergy'
+$interconnect_type_2 = 'Synergy 20Gb Interconnect Link Module'
+$network_names = [ 'tunnelnet1' ]
+oneview_logical_interconnect_group{'Puppet - Synergy Tunnel LIG with 2 Enclosures':
   ensure => 'present',
   data   => {
-    name               => 'Puppet Ethernet LIG Synergy',
-    redundancyType     => 'Redundant',
+    name               => 'Puppet - Synergy Tunnel LIG with 2 Enclosures',
+    redundancyType     => 'HighlyAvailable',
     interconnectBaySet => 3,
+    enclosureType      => 'SY12000',
+    enclosureIndexes   => [1, 2],
+    uplinkSets         =>
+    [
+      {
+        name                => 'TUNNEL_ETH_UP_01',
+        ethernetNetworkType => 'Tunnel',
+        networkType         => 'Ethernet',
+        lacpTimer           => 'Short',
+        mode                => 'Auto',
+        uplink_ports        => [{ bay             => 3,
+                                  port            => 'Q1',
+                                  type            => $interconnect_type_1,
+                                  enclosure_index => 1 },
+                                { bay             => 6,
+                                  port            => 'Q1',
+                                  type            => $interconnect_type_1,
+                                  enclosure_index => 2 }
+        ],
+        networkUris         => $network_names
+      }
+    ],
     interconnects      =>
     [
       {
-        bay  => 3,
-        type => 'Virtual Connect SE 40Gb F8 Module for Synergy'
+        bay             => 3,
+        type            => $interconnect_type_1,
+        enclosure_index => 1
       },
       {
-        bay  => 6,
-        type => 'Virtual Connect SE 40Gb F8 Module for Synergy'
+        bay             => 6,
+        type            => $interconnect_type_1,
+        enclosure_index => 2
       },
+      {
+        bay             => 3,
+        type            => $interconnect_type_2,
+        enclosure_index => 2
+      },
+      {
+        bay             => 6,
+        type            => $interconnect_type_2,
+        enclosure_index => 1
+      }
     ]
   }
 }
@@ -48,22 +86,24 @@
     interconnects      =>
     [
       {
-        bay  => 1,
-        type => 'Virtual Connect SE 16Gb FC Module for Synergy'
+        bay             => 1,
+        type            => 'Virtual Connect SE 16Gb FC Module for Synergy',
+        enclosure_index => -1
       },
       {
-        bay  => 4,
-        type => 'Virtual Connect SE 16Gb FC Module for Synergy'
+        bay             => 4,
+        type            => 'Virtual Connect SE 16Gb FC Module for Synergy',
+        enclosure_index => -1
       },
     ]
   }
 }
 
 oneview_logical_interconnect_group{'Logical Interconnect Group Edit':
   ensure  => 'present',
-  require => Oneview_logical_interconnect_group['Puppet Ethernet LIG Synergy'],
+  require => Oneview_logical_interconnect_group['Puppet - Synergy Tunnel LIG with 2 Enclosures'],
   data    => {
-    name     => 'Puppet Ethernet LIG Synergy',
+    name     => 'Puppet - Synergy Tunnel LIG with 2 Enclosures',
     new_name => 'Edited LIG'
   }
 }

lib/puppet/provider/oneview_logical_interconnect_group/c7000.rb

@@ -119,7 +119,8 @@ def set_network(uplink_set, network_type, network_uris)
   # Method to add the uplink bay & port to the LIGuplinkSet using helpers
   def set_uplink_ports(uplink_set, uplink_ports)
     uplink_ports.each do |uplink_port|
-      uplink_set.add_uplink(uplink_port['bay'], uplink_port['port'])
+      uplink_port['enclosure_index'] ||= 1
+      uplink_set.add_uplink(uplink_port['bay'], uplink_port['port'], uplink_port['type'], uplink_port['enclosure_index'])
     end
     uplink_set
   end

lib/puppet/provider/oneview_logical_interconnect_group/synergy.rb

@@ -22,6 +22,7 @@
   def parse_interconnects
     lig = OneviewSDK.resource_named(:LogicalInterconnectGroup, login[:api_version], 'Synergy').new(@client, {})
     @interconnects.each do |item|
+      item['enclosure_index'] ||= 1
       lig.add_interconnect(item['bay'].to_i, item['type'], item['logical_downlink'], item['enclosure_index'])
     end
     lig['interconnectMapTemplate']

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "hewlettpackard-oneview",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "Hewlett Packard Enterprise",
   "summary": "HPE Puppet providers and types for management of HPE OneView Appliances",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
   "requirements": [
     {"name":"puppet","version_requirement":">= 4.1.0"},
     {"name": "ruby","version_requirement": ">=2.2.3"},
-    {"name": "oneview-sdk-ruby","version_requirement": ">=4.2.0"}
+    {"name": "oneview-sdk-ruby","version_requirement": ">=4.4.0"}
   ],
   "tags": [ "oneview", "hpe", "hewlett packard enterprise", "i3s", "image streamer", "bare-metal provisioning" ],
   "data_provider": null