Merge pull request #471 from HewlettPackard/API2000_enclosure_resources

Added API2000 support for enclosure resources

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Oneview Features supported
 - oneview_connection_template
+- oneview_enclosure
+- oneview_enclosure_group
 - oneview_ethernet_network
 - oneview_fc_network
 - oneview_fcoe_network
@@ -19,6 +21,8 @@
 - oneview_network_set
 - oneview_scope
 - oneview_server_certificate
+- oneview_server_hardware
+- oneview_server_hardware_type
 - oneview_server_profile
 - oneview_server_profile_template
 - oneview_storage_pool

examples/demo/infrastructure_provisioning_with_storage.rb

@@ -25,11 +25,13 @@
   url: ENV['ONEVIEWSDK_URL'],
   user: ENV['ONEVIEWSDK_USER'],
   password: ENV['ONEVIEWSDK_PASSWORD'],
-  api_version: 1800
+  api_version: 2000
 }
 
 my_server_hardware_type = 'SY 480 Gen9 2'
+my_server_hardware = 'SYN03_Frame1, bay 3'
 my_enclosure_group = 'EG'
+my_spt = 'SPT-102'
 my_fc_network_data = [
   {
     FC01: {
@@ -62,7 +64,7 @@
 ]
 
 # To create server profile template
-oneview_server_profile_template 'SPT-102' do
+oneview_server_profile_template my_spt do
   client my_client
   enclosure_group my_enclosure_group
   server_hardware_type my_server_hardware_type
@@ -81,13 +83,12 @@
   client my_client
   enclosure_group my_enclosure_group
   server_hardware_type my_server_hardware_type
-  server_profile_template 'SPT-102'
-  server_hardware 'SYN03_Frame1, bay 3'
+  server_profile_template my_spt
+  server_hardware my_server_hardware
 end
 
 # Power on the server
-
-oneview_server_hardware 'SYN03_Frame1, bay 3' do
+oneview_server_hardware my_server_hardware do
   client my_client
   power_state 'on'
   action :set_power_state

examples/enclosure.rb

@@ -19,10 +19,13 @@
   url: ENV['ONEVIEWSDK_URL'],
   user: ENV['ONEVIEWSDK_USER'],
   password: ENV['ONEVIEWSDK_PASSWORD'],
-  api_version: 1800
+  api_version: 2000,
+  api_variant: 'Synergy'
 }
 
-oneview_enclosure 'Encl1' do
+enc_name = '0000A66102'
+
+oneview_enclosure enc_name do
   data(
     hostname: '172.18.1.11',
     username: 'dcs',
@@ -32,12 +35,13 @@
   enclosure_group 'Eg1'
   client my_client
   action :add
+  only_if { client[:api_variant] == 'C7000' }
 end
 
 #Generate certificate Signing Request
-oneview_enclosure 'e10' do
+oneview_enclosure enc_name do
   client my_client
-  bay_number 1
+  bay_number 1 # bay number is required only for C7000
   csr_file_path 'file_path_of_csr_file'
   csr_data(
     type: 'CertificateDtoV2',
@@ -53,17 +57,17 @@
 end
 
 #Import a signed server certtificate into 'Encl1'
-oneview_enclosure 'e10' do
+oneview_enclosure enc_name do
   client my_client
-  bay_number 1
+  bay_number 1 # bay number is required only for C7000
   csr_file_path 'file_path_of_csr_file'
   csr_type 'CertificateDataV2'
   action :import_certificate
 end
 
 # Rename enclosure
 # Warning: Operation persists in hardware
-oneview_enclosure 'Encl1' do
+oneview_enclosure enc_name do
   client my_client
   operation 'replace'
   path '/name'
@@ -76,42 +80,47 @@
   client my_client
   operation 'replace'
   path '/name'
-  value 'Encl1'
+  value enc_name
   action :patch
 end
 
 # Refreshes the enclosure
-oneview_enclosure 'Encl1' do
+oneview_enclosure enc_name do
   client my_client
   action :refresh
 end
 
 # Supported for API 300 till 500
 # Adds 'Encl1' to 'Scope1' and 'Scope2'
-oneview_enclosure 'Encl1' do
+oneview_enclosure enc_name do
   client my_client
   scopes ['Scope1', 'Scope2']
   action :add_to_scopes
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Supported for API 300 till 500
 # Removes 'Encl1' from 'Scope1'
-oneview_enclosure 'Encl1' do
+oneview_enclosure enc_name do
   client my_client
   scopes ['Scope1']
   action :remove_from_scopes
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Supported for API 300 till 500
 # Replaces 'Scope1' and 'Scope2' for 'Encl1'
-oneview_enclosure 'Encl1' do
+oneview_enclosure enc_name do
   client my_client
   scopes ['Scope1', 'Scope2']
   action :replace_scopes
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
+# Remove operation will work only for C7000
 # Removes it from the appliance
-oneview_enclosure 'Encl1' do
+oneview_enclosure enc_name do
   client my_client
   action :remove
+  only_if { client[:api_variant] == 'C7000' }
 end

examples/enclosure_group.rb

@@ -13,12 +13,13 @@
   url: ENV['ONEVIEWSDK_URL'],
   user: ENV['ONEVIEWSDK_USER'],
   password: ENV['ONEVIEWSDK_PASSWORD'],
-  api_version: 1800
+  api_version: 2000,
+  api_variant: 'Synergy'
 }
 
 interconnect_bay_mapping = [
-       { interconnectBay: 1, logicalInterconnectGroupUri: '/rest/logical-interconnect-groups/a6ac18fa-c0a6-4937-96ea-3d0da4fe7e21' },
-       { interconnectBay: 4, logicalInterconnectGroupUri: '/rest/logical-interconnect-groups/a6ac18fa-c0a6-4937-96ea-3d0da4fe7e21' }
+       { interconnectBay: 3, logicalInterconnectGroupUri: '/rest/logical-interconnect-groups/a6ac18fa-c0a6-4937-96ea-3d0da4fe7e21' },
+       { interconnectBay: 6, logicalInterconnectGroupUri: '/rest/logical-interconnect-groups/a6ac18fa-c0a6-4937-96ea-3d0da4fe7e21' }
 ]
 
 oneview_enclosure_group 'Eg2' do
@@ -39,6 +40,7 @@
   api_variant 'C7000'
   script '#TEST COMMAND'
   action :set_script
+  only_if { client[:api_variant] == 'C7000' }
 end
 
 oneview_enclosure_group 'Eg2' do

examples/ethernet_network.rb

@@ -67,7 +67,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :add_to_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Only for V300 and V500
@@ -76,7 +76,7 @@
   client my_client
   scopes ['Scope1']
   action :remove_from_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Only for V300 and V500
@@ -85,7 +85,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :replace_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Only for V300 and V500
@@ -95,7 +95,7 @@
   operation 'replace'
   path '/scopeUris'
   value []
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
   action :patch
 end
 

examples/fc_network.rb

@@ -65,7 +65,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :add_to_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Removes 'Fc1' from 'Scope1'
@@ -74,7 +74,7 @@
   client my_client
   scopes ['Scope1']
   action :remove_from_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Replaces 'Scope1' and 'Scope2' for 'Fc1'
@@ -83,7 +83,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :replace_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Replaces all scopes to empty list of scopes
@@ -94,7 +94,7 @@
   path '/scopeUris'
   value []
   action :patch
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Reset the connection template for a fc network

examples/fcoe_network.rb

@@ -56,7 +56,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :add_to_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Removes 'FCoE1' from 'Scope1'
@@ -65,7 +65,7 @@
   client my_client
   scopes ['Scope1']
   action :remove_from_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Replaces scopes to 'Scope1' and 'Scope2'
@@ -74,7 +74,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :replace_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Replaces all scopes to empty list of scopes
@@ -85,7 +85,7 @@
   path '/scopeUris'
   value []
   action :patch
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Reset the connection template for 'FCoE1'

examples/network_set.rb

@@ -66,7 +66,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :add_to_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Removes 'ChefNetworkSet_1' from 'Scope1'
@@ -75,7 +75,7 @@
   client my_client
   scopes ['Scope1']
   action :remove_from_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Replaces 'Scope1' and 'Scope2' for 'ChefNetworkSet_1'
@@ -84,7 +84,7 @@
   client my_client
   scopes ['Scope1', 'Scope2']
   action :replace_scopes
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Replaces all scopes to empty list of scopes
@@ -95,7 +95,7 @@
   path '/scopeUris'
   value []
   action :patch
-  only_if { client[:api_version] == 300 && client[:api_version] == 500 }
+  only_if { client[:api_version] == 300 || client[:api_version] == 500 }
 end
 
 # Example: Reset the connection template for a network