From be6d009e9f19590579934f8480c289e847c0a1a8 Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Mon, 23 Jan 2017 10:21:43 -0300
Subject: [PATCH 01/10] Fixes #93: Logical Switch refresh conflict

---
 CHANGELOG.md                                              | 8 ++++++--
 lib/oneview-sdk/resource/api200/logical_switch.rb         | 2 +-
 .../resource/api200/logical_switch/update_spec.rb         | 4 ++--
 .../resource/api300/c7000/logical_switch/update_spec.rb   | 4 ++--
 spec/unit/resource/api200/logical_switch_spec.rb          | 6 +++---
 spec/unit/resource/api300/c7000/logical_switch_spec.rb    | 6 +++---
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d38ff0c91..6f6d00bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
-# Unreleased Changes
-**Proposed Version:** v3.1.0
+## Unreleased: v4.0.0
+
+ 1. Bug fixes:
+    - Fixed issue #93 Logical Switch refresh conflict
+
+# v3.1.0
 
  1. Added full support to OneView Rest API version 300 for the hardware variants C7000 and Synergy to the already existing features:
    - Interconnect
diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index 4b7325c91..cedba39d1 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -49,7 +49,7 @@ def create
       # Updates this object using the data that exists on OneView
       # @note Will overwrite any data that differs from OneView
       # @return [Resource] self
-      def refresh
+      def refresh_data_state!
         response = @client.rest_put(@data['uri'] + '/refresh')
         @client.response_handler(response)
       end
diff --git a/spec/integration/resource/api200/logical_switch/update_spec.rb b/spec/integration/resource/api200/logical_switch/update_spec.rb
index 8256478a2..be07358c6 100644
--- a/spec/integration/resource/api200/logical_switch/update_spec.rb
+++ b/spec/integration/resource/api200/logical_switch/update_spec.rb
@@ -8,9 +8,9 @@
     @item.retrieve!
   end
 
-  describe '#refresh' do
+  describe '#refresh_data_state!' do
     it 'refresh logical switch' do
-      @item.refresh
+      @item.refresh_data_state!
     end
   end
 end
diff --git a/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb b/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
index bc449e05a..7191f15f4 100644
--- a/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
+++ b/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
@@ -9,9 +9,9 @@
     @item.retrieve!
   end
 
-  describe '#refresh' do
+  describe '#refresh_data_state!' do
     it 'refresh logical switch' do
-      @item.refresh
+      @item.refresh_data_state!
     end
   end
 end
diff --git a/spec/unit/resource/api200/logical_switch_spec.rb b/spec/unit/resource/api200/logical_switch_spec.rb
index 8689f69f5..db88a2f94 100644
--- a/spec/unit/resource/api200/logical_switch_spec.rb
+++ b/spec/unit/resource/api200/logical_switch_spec.rb
@@ -38,11 +38,11 @@
     end
   end
 
-  describe '#refresh' do
-    it 'Refresh' do
+  describe '#refresh_data_state!' do
+    it 'Refresh logical switch' do
       item = OneviewSDK::LogicalSwitch.new(@client, uri: '/rest/fake')
       expect(@client).to receive(:rest_put).with("#{item['uri']}/refresh").and_return(FakeResponse.new({}))
-      item.refresh
+      item.refresh_data_state!
     end
   end
 
diff --git a/spec/unit/resource/api300/c7000/logical_switch_spec.rb b/spec/unit/resource/api300/c7000/logical_switch_spec.rb
index 0da825d78..edd73c5d8 100644
--- a/spec/unit/resource/api300/c7000/logical_switch_spec.rb
+++ b/spec/unit/resource/api300/c7000/logical_switch_spec.rb
@@ -61,11 +61,11 @@
     end
   end
 
-  describe '#refresh' do
-    it 'Refresh' do
+  describe '#refresh_data_state!' do
+    it 'Refresh logical switch' do
       item = OneviewSDK::API300::C7000::LogicalSwitch.new(@client_300, uri: '/rest/fake')
       expect(@client_300).to receive(:rest_put).with("#{item['uri']}/refresh").and_return(FakeResponse.new({}))
-      item.refresh
+      item.refresh_data_state!
     end
   end
 

From 9c927d3840a575dc1361000e4cc217e782cdbc1b Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Mon, 23 Jan 2017 10:57:13 -0300
Subject: [PATCH 02/10] Changed name of a method in Logical Switch

---
 lib/oneview-sdk/resource/api200/logical_switch.rb             | 2 +-
 .../integration/resource/api200/logical_switch/update_spec.rb | 4 ++--
 .../resource/api300/c7000/logical_switch/update_spec.rb       | 4 ++--
 spec/unit/resource/api200/logical_switch_spec.rb              | 4 ++--
 spec/unit/resource/api300/c7000/logical_switch_spec.rb        | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index cedba39d1..dbb4acfe5 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -49,7 +49,7 @@ def create
       # Updates this object using the data that exists on OneView
       # @note Will overwrite any data that differs from OneView
       # @return [Resource] self
-      def refresh_data_state!
+      def refresh_state!
         response = @client.rest_put(@data['uri'] + '/refresh')
         @client.response_handler(response)
       end
diff --git a/spec/integration/resource/api200/logical_switch/update_spec.rb b/spec/integration/resource/api200/logical_switch/update_spec.rb
index be07358c6..bac493250 100644
--- a/spec/integration/resource/api200/logical_switch/update_spec.rb
+++ b/spec/integration/resource/api200/logical_switch/update_spec.rb
@@ -8,9 +8,9 @@
     @item.retrieve!
   end
 
-  describe '#refresh_data_state!' do
+  describe '#refresh_state!' do
     it 'refresh logical switch' do
-      @item.refresh_data_state!
+      @item.refresh_state!
     end
   end
 end
diff --git a/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb b/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
index 7191f15f4..00d088e41 100644
--- a/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
+++ b/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
@@ -9,9 +9,9 @@
     @item.retrieve!
   end
 
-  describe '#refresh_data_state!' do
+  describe '#refresh_state!' do
     it 'refresh logical switch' do
-      @item.refresh_data_state!
+      @item.refresh_state!
     end
   end
 end
diff --git a/spec/unit/resource/api200/logical_switch_spec.rb b/spec/unit/resource/api200/logical_switch_spec.rb
index db88a2f94..5da5b5d61 100644
--- a/spec/unit/resource/api200/logical_switch_spec.rb
+++ b/spec/unit/resource/api200/logical_switch_spec.rb
@@ -38,11 +38,11 @@
     end
   end
 
-  describe '#refresh_data_state!' do
+  describe '#refresh_state!' do
     it 'Refresh logical switch' do
       item = OneviewSDK::LogicalSwitch.new(@client, uri: '/rest/fake')
       expect(@client).to receive(:rest_put).with("#{item['uri']}/refresh").and_return(FakeResponse.new({}))
-      item.refresh_data_state!
+      item.refresh_state!
     end
   end
 
diff --git a/spec/unit/resource/api300/c7000/logical_switch_spec.rb b/spec/unit/resource/api300/c7000/logical_switch_spec.rb
index edd73c5d8..f47c2f8e3 100644
--- a/spec/unit/resource/api300/c7000/logical_switch_spec.rb
+++ b/spec/unit/resource/api300/c7000/logical_switch_spec.rb
@@ -61,11 +61,11 @@
     end
   end
 
-  describe '#refresh_data_state!' do
+  describe '#refresh_state!' do
     it 'Refresh logical switch' do
       item = OneviewSDK::API300::C7000::LogicalSwitch.new(@client_300, uri: '/rest/fake')
       expect(@client_300).to receive(:rest_put).with("#{item['uri']}/refresh").and_return(FakeResponse.new({}))
-      item.refresh_data_state!
+      item.refresh_state!
     end
   end
 

From 5401f01fa7b8653f62a49ca030ec24eb2277e441 Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Mon, 23 Jan 2017 13:49:10 -0300
Subject: [PATCH 03/10] Added examples for refresh_state! of Logical Switch

---
 examples/api200/logical_switch.rb       | 11 ++++++++---
 examples/api300/c7000/logical_switch.rb |  5 +++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/examples/api200/logical_switch.rb b/examples/api200/logical_switch.rb
index 93f2ba550..7136c5c6d 100644
--- a/examples/api200/logical_switch.rb
+++ b/examples/api200/logical_switch.rb
@@ -22,13 +22,18 @@
 logical_switch = OneviewSDK::LogicalSwitch.new(
   @client,
   name: 'Teste_SDK',
-  logicalSwitchGroupUri: '/rest/logical-switch-groups/2c5de7f0-7cb6-4897-9423-181e625a614c'
+  logicalSwitchGroupUri: '/rest/logical-switch-groups/8d1fe1cb-cf46-4711-bd73-73ea2c0f2062'
 )
 
 # Adding switches credentials
-logical_switch.set_switch_credentials('172.16.11.11', ssh_credentials, snmp_v1)
-logical_switch.set_switch_credentials('172.16.11.12', ssh_credentials, snmp_v1_2)
+logical_switch.set_switch_credentials('172.18.16.91', ssh_credentials, snmp_v1)
+logical_switch.set_switch_credentials('172.18.16.92', ssh_credentials, snmp_v1_2)
 
 # Creates logical switch for a switch group
 logical_switch.create
 puts "Logical switch created with uri=#{logical_switch['uri']}"
+
+# Refresh state of logical switch
+puts "Refreshing state of logical switch"
+logical_switch.refresh_state!
+puts "Refreshed successfully!"
diff --git a/examples/api300/c7000/logical_switch.rb b/examples/api300/c7000/logical_switch.rb
index 49e57fecd..fc76647b6 100644
--- a/examples/api300/c7000/logical_switch.rb
+++ b/examples/api300/c7000/logical_switch.rb
@@ -43,3 +43,8 @@
 # Retrieves a specific Internal Link Set
 internal_link_set = OneviewSDK::API300::C7000::LogicalSwitch.get_internal_link_set(@client, 'ils1')
 puts "Internal Link Set #{internal_link_set['name']} URI=#{internal_link_set['uri']}"
+
+# Refresh state of logical switch
+puts "Refreshing state of logical switch"
+logical_switch.refresh_state!
+puts "Refreshed successfully!"

From 5abfc6ae45ff2cdd22b5de6d543468fc9940f60f Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Mon, 23 Jan 2017 13:55:23 -0300
Subject: [PATCH 04/10] Fixed Style/StringLiterals problems in examples of
 Logical Switch

---
 examples/api200/logical_switch.rb       | 4 ++--
 examples/api300/c7000/logical_switch.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/api200/logical_switch.rb b/examples/api200/logical_switch.rb
index 7136c5c6d..6430e336e 100644
--- a/examples/api200/logical_switch.rb
+++ b/examples/api200/logical_switch.rb
@@ -34,6 +34,6 @@
 puts "Logical switch created with uri=#{logical_switch['uri']}"
 
 # Refresh state of logical switch
-puts "Refreshing state of logical switch"
+puts 'Refreshing state of logical switch'
 logical_switch.refresh_state!
-puts "Refreshed successfully!"
+puts 'Refreshed successfully!'
diff --git a/examples/api300/c7000/logical_switch.rb b/examples/api300/c7000/logical_switch.rb
index fc76647b6..7ee6ced68 100644
--- a/examples/api300/c7000/logical_switch.rb
+++ b/examples/api300/c7000/logical_switch.rb
@@ -45,6 +45,6 @@
 puts "Internal Link Set #{internal_link_set['name']} URI=#{internal_link_set['uri']}"
 
 # Refresh state of logical switch
-puts "Refreshing state of logical switch"
+puts 'Refreshing state of logical switch'
 logical_switch.refresh_state!
-puts "Refreshed successfully!"
+puts 'Refreshed successfully!'

From a5545bb3da2f26deed23267bb217f5ee7ce71608 Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Mon, 23 Jan 2017 19:19:31 -0300
Subject: [PATCH 05/10] Refactor text in Changelog about bugfix of
 LogicalSwitch

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad80411b9..f5d12b0a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Unreleased Changes
 
-## Unreleased: v4.0.0
+## Suggested release: v4.0.0
 
-#### Bug fixes:
+#### Breaking changes:
 - Fixed issue #93 Logical Switch refresh conflict
 
 #### Design changes:

From 915a3e98f53bdec49ce860f111de02766f2f7ba7 Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Tue, 24 Jan 2017 09:18:24 -0300
Subject: [PATCH 06/10] Changed method refresh_state! of LogicalSwitch

- Method documentation comment was changed
- The method returning the LogicalSwitch object
---
 lib/oneview-sdk/resource/api200/logical_switch.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index dbb4acfe5..86e8a593c 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -46,12 +46,13 @@ def create
         self
       end
 
-      # Updates this object using the data that exists on OneView
-      # @note Will overwrite any data that differs from OneView
-      # @return [Resource] self
+      # Reclaims the top-of-rack switches in a logical switch.
+      # @return [OneviewSDK::LogicalSwitch] self
       def refresh_state!
         response = @client.rest_put(@data['uri'] + '/refresh')
         @client.response_handler(response)
+        set_all(body)
+        self
       end
 
 

From 972655fb725f2a818f21ea3f865fa2b6e5e9b6d8 Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Tue, 24 Jan 2017 09:54:23 -0300
Subject: [PATCH 07/10] Exported literal values used in example to variables
 (for LogicalSwitch)

---
 examples/_client.rb.example                       |  5 +++++
 examples/api200/logical_switch.rb                 | 13 +++++++------
 examples/api300/c7000/logical_switch.rb           | 13 +++++++------
 lib/oneview-sdk/resource/api200/logical_switch.rb |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/examples/_client.rb.example b/examples/_client.rb.example
index aacbf46b7..55f7c1cab 100644
--- a/examples/_client.rb.example
+++ b/examples/_client.rb.example
@@ -38,3 +38,8 @@ puts "Connected to OneView appliance at #{@client.url}\n\n"
 # @sas_interconnect_type = 'Synergy 12Gb SAS Connection Module'
 # @synergy_enclosure_hostname = 'fe80::2:0:9:1%eth2'
 # @interconnect_name = '0000A66101, interconnect 3'
+# @logical_switch1_ip = '172.18.16.91'
+# @logical_switch2_ip = '172.18.16.92'
+# @logical_switch_ssh_user = "dcs"
+# @logical_switch_ssh_password = "dcs"
+# @logical_switch_community_string = "public"
diff --git a/examples/api200/logical_switch.rb b/examples/api200/logical_switch.rb
index 6430e336e..aca99fee7 100644
--- a/examples/api200/logical_switch.rb
+++ b/examples/api200/logical_switch.rb
@@ -12,22 +12,23 @@
 require_relative '../_client'
 
 # SSH Credential
-ssh_credentials = OneviewSDK::LogicalSwitch::CredentialsSSH.new('dcs', 'dcs')
+ssh_credentials = OneviewSDK::LogicalSwitch::CredentialsSSH.new(@logical_switch_ssh_user, @logical_switch_ssh_password)
 
 # SNMP credentials
-snmp_v1 = OneviewSDK::LogicalSwitch::CredentialsSNMPV1.new(161, 'public')
-snmp_v1_2 = OneviewSDK::LogicalSwitch::CredentialsSNMPV1.new(161, 'public')
+snmp_v1 = OneviewSDK::LogicalSwitch::CredentialsSNMPV1.new(161, @logical_switch_community_string)
+snmp_v1_2 = OneviewSDK::LogicalSwitch::CredentialsSNMPV1.new(161, @logical_switch_community_string)
 
+logical_switch_group = OneviewSDK::LogicalSwitchGroup.get_all(@client).first
 
 logical_switch = OneviewSDK::LogicalSwitch.new(
   @client,
   name: 'Teste_SDK',
-  logicalSwitchGroupUri: '/rest/logical-switch-groups/8d1fe1cb-cf46-4711-bd73-73ea2c0f2062'
+  logicalSwitchGroupUri: logical_switch_group['uri']
 )
 
 # Adding switches credentials
-logical_switch.set_switch_credentials('172.18.16.91', ssh_credentials, snmp_v1)
-logical_switch.set_switch_credentials('172.18.16.92', ssh_credentials, snmp_v1_2)
+logical_switch.set_switch_credentials(@logical_switch1_ip, ssh_credentials, snmp_v1)
+logical_switch.set_switch_credentials(@logical_switch2_ip, ssh_credentials, snmp_v1_2)
 
 # Creates logical switch for a switch group
 logical_switch.create
diff --git a/examples/api300/c7000/logical_switch.rb b/examples/api300/c7000/logical_switch.rb
index 7ee6ced68..2ad478f4b 100644
--- a/examples/api300/c7000/logical_switch.rb
+++ b/examples/api300/c7000/logical_switch.rb
@@ -12,22 +12,23 @@
 require_relative '../../_client'
 
 # SSH Credential
-ssh_credentials = OneviewSDK::API300::C7000::LogicalSwitch::CredentialsSSH.new('dcs', 'dcs')
+ssh_credentials = OneviewSDK::API300::C7000::LogicalSwitch::CredentialsSSH.new(@logical_switch_ssh_user, @logical_switch_ssh_password)
 
 # SNMP credentials
-snmp_v1 = OneviewSDK::API300::C7000::LogicalSwitch::CredentialsSNMPV1.new(161, 'admin')
-snmp_v1_2 = OneviewSDK::API300::C7000::LogicalSwitch::CredentialsSNMPV1.new(161, 'admin')
+snmp_v1 = OneviewSDK::API300::C7000::LogicalSwitch::CredentialsSNMPV1.new(161, @logical_switch_community_string)
+snmp_v1_2 = OneviewSDK::API300::C7000::LogicalSwitch::CredentialsSNMPV1.new(161, @logical_switch_community_string)
 
+logical_switch_group = OneviewSDK::API300::C7000::LogicalSwitchGroup.get_all(@client).first
 
 logical_switch = OneviewSDK::API300::C7000::LogicalSwitch.new(
   @client,
   name: 'Test_SDK',
-  logicalSwitchGroupUri: '/rest/logical-switch-groups/2c5de7f0-7cb6-4897-9423-181e625a614c'
+  logicalSwitchGroupUri: logical_switch_group['uri']
 )
 
 # Adding switches credentials
-logical_switch.set_switch_credentials('172.16.11.11', ssh_credentials, snmp_v1)
-logical_switch.set_switch_credentials('172.16.11.12', ssh_credentials, snmp_v1_2)
+logical_switch.set_switch_credentials(@logical_switch1_ip, ssh_credentials, snmp_v1)
+logical_switch.set_switch_credentials(@logical_switch2_ip, ssh_credentials, snmp_v1_2)
 
 # Creates logical switch for a switch group
 logical_switch.create
diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index 86e8a593c..78314a8ae 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -50,7 +50,7 @@ def create
       # @return [OneviewSDK::LogicalSwitch] self
       def refresh_state!
         response = @client.rest_put(@data['uri'] + '/refresh')
-        @client.response_handler(response)
+        body = @client.response_handler(response)
         set_all(body)
         self
       end

From c8a9338661afd5be6dcb94a6329b9a6f3ff2104f Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Tue, 24 Jan 2017 10:16:20 -0300
Subject: [PATCH 08/10] applying changes to LogicalSwitch based on PR comments

---
 examples/api200/logical_switch.rb                 | 2 +-
 examples/api300/c7000/logical_switch.rb           | 2 +-
 lib/oneview-sdk/resource/api200/logical_switch.rb | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/api200/logical_switch.rb b/examples/api200/logical_switch.rb
index aca99fee7..4352350a3 100644
--- a/examples/api200/logical_switch.rb
+++ b/examples/api200/logical_switch.rb
@@ -22,7 +22,7 @@
 
 logical_switch = OneviewSDK::LogicalSwitch.new(
   @client,
-  name: 'Teste_SDK',
+  name: 'LogicalSwitch',
   logicalSwitchGroupUri: logical_switch_group['uri']
 )
 
diff --git a/examples/api300/c7000/logical_switch.rb b/examples/api300/c7000/logical_switch.rb
index 2ad478f4b..280ef2fde 100644
--- a/examples/api300/c7000/logical_switch.rb
+++ b/examples/api300/c7000/logical_switch.rb
@@ -22,7 +22,7 @@
 
 logical_switch = OneviewSDK::API300::C7000::LogicalSwitch.new(
   @client,
-  name: 'Test_SDK',
+  name: 'LogicalSwitch',
   logicalSwitchGroupUri: logical_switch_group['uri']
 )
 
diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index 78314a8ae..e776a71a8 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -52,7 +52,6 @@ def refresh_state!
         response = @client.rest_put(@data['uri'] + '/refresh')
         body = @client.response_handler(response)
         set_all(body)
-        self
       end
 
 

From 4e9959071a70c7370e93db5b431416cccb237144 Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Wed, 25 Jan 2017 10:03:56 -0300
Subject: [PATCH 09/10] Refactored the name of method refresh_state and its
 return (LogicalSwitch)

---
 examples/api200/logical_switch.rb                          | 7 +++----
 examples/api300/c7000/logical_switch.rb                    | 7 +++----
 lib/oneview-sdk/resource/api200/logical_switch.rb          | 7 +++----
 .../resource/api200/logical_switch/update_spec.rb          | 6 +++---
 .../resource/api300/c7000/logical_switch/update_spec.rb    | 6 +++---
 spec/unit/resource/api200/logical_switch_spec.rb           | 4 ++--
 spec/unit/resource/api300/c7000/logical_switch_spec.rb     | 4 ++--
 7 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/examples/api200/logical_switch.rb b/examples/api200/logical_switch.rb
index 4352350a3..4216adcfc 100644
--- a/examples/api200/logical_switch.rb
+++ b/examples/api200/logical_switch.rb
@@ -34,7 +34,6 @@
 logical_switch.create
 puts "Logical switch created with uri=#{logical_switch['uri']}"
 
-# Refresh state of logical switch
-puts 'Refreshing state of logical switch'
-logical_switch.refresh_state!
-puts 'Refreshed successfully!'
+puts 'Reclaiming the top-of-rack switches in a logical switch'
+logical_switch.refresh_state
+puts 'Action done Successfully!'
diff --git a/examples/api300/c7000/logical_switch.rb b/examples/api300/c7000/logical_switch.rb
index 280ef2fde..c4afc73ae 100644
--- a/examples/api300/c7000/logical_switch.rb
+++ b/examples/api300/c7000/logical_switch.rb
@@ -45,7 +45,6 @@
 internal_link_set = OneviewSDK::API300::C7000::LogicalSwitch.get_internal_link_set(@client, 'ils1')
 puts "Internal Link Set #{internal_link_set['name']} URI=#{internal_link_set['uri']}"
 
-# Refresh state of logical switch
-puts 'Refreshing state of logical switch'
-logical_switch.refresh_state!
-puts 'Refreshed successfully!'
+puts 'Reclaiming the top-of-rack switches in a logical switch'
+logical_switch.refresh_state
+puts 'Action done Successfully!'
diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index e776a71a8..aaae01867 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -47,11 +47,10 @@ def create
       end
 
       # Reclaims the top-of-rack switches in a logical switch.
-      # @return [OneviewSDK::LogicalSwitch] self
-      def refresh_state!
+      # @return [Hash] Http response body with logical switch data.
+      def refresh_state
         response = @client.rest_put(@data['uri'] + '/refresh')
-        body = @client.response_handler(response)
-        set_all(body)
+        @client.response_handler(response)
       end
 
 
diff --git a/spec/integration/resource/api200/logical_switch/update_spec.rb b/spec/integration/resource/api200/logical_switch/update_spec.rb
index bac493250..b42c9c255 100644
--- a/spec/integration/resource/api200/logical_switch/update_spec.rb
+++ b/spec/integration/resource/api200/logical_switch/update_spec.rb
@@ -8,9 +8,9 @@
     @item.retrieve!
   end
 
-  describe '#refresh_state!' do
-    it 'refresh logical switch' do
-      @item.refresh_state!
+  describe '#refresh_state' do
+    it 'should reclaims the top-of-rack switches in a logical switch' do
+      expect { @item.refresh_state }.to_not raise_error
     end
   end
 end
diff --git a/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb b/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
index 00d088e41..e1eacc87c 100644
--- a/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
+++ b/spec/integration/resource/api300/c7000/logical_switch/update_spec.rb
@@ -9,9 +9,9 @@
     @item.retrieve!
   end
 
-  describe '#refresh_state!' do
-    it 'refresh logical switch' do
-      @item.refresh_state!
+  describe '#refresh_state' do
+    it 'should reclaims the top-of-rack switches in a logical switch' do
+      expect { @item.refresh_state }.to_not raise_error
     end
   end
 end
diff --git a/spec/unit/resource/api200/logical_switch_spec.rb b/spec/unit/resource/api200/logical_switch_spec.rb
index 5da5b5d61..e8655a64c 100644
--- a/spec/unit/resource/api200/logical_switch_spec.rb
+++ b/spec/unit/resource/api200/logical_switch_spec.rb
@@ -38,11 +38,11 @@
     end
   end
 
-  describe '#refresh_state!' do
+  describe '#refresh_state' do
     it 'Refresh logical switch' do
       item = OneviewSDK::LogicalSwitch.new(@client, uri: '/rest/fake')
       expect(@client).to receive(:rest_put).with("#{item['uri']}/refresh").and_return(FakeResponse.new({}))
-      item.refresh_state!
+      item.refresh_state
     end
   end
 
diff --git a/spec/unit/resource/api300/c7000/logical_switch_spec.rb b/spec/unit/resource/api300/c7000/logical_switch_spec.rb
index f47c2f8e3..160c47050 100644
--- a/spec/unit/resource/api300/c7000/logical_switch_spec.rb
+++ b/spec/unit/resource/api300/c7000/logical_switch_spec.rb
@@ -61,11 +61,11 @@
     end
   end
 
-  describe '#refresh_state!' do
+  describe '#refresh_state' do
     it 'Refresh logical switch' do
       item = OneviewSDK::API300::C7000::LogicalSwitch.new(@client_300, uri: '/rest/fake')
       expect(@client_300).to receive(:rest_put).with("#{item['uri']}/refresh").and_return(FakeResponse.new({}))
-      item.refresh_state!
+      item.refresh_state
     end
   end
 

From a698113b36a7e67a0a4ba487cc1a4005fc8c20cc Mon Sep 17 00:00:00 2001
From: Ricardo Galeno <ricardogaleno.rg@gmail.com>
Date: Fri, 27 Jan 2017 13:25:42 -0300
Subject: [PATCH 10/10] Removed doc comment about return of method
 refresh_state (LogicalSwitch)

---
 lib/oneview-sdk/resource/api200/logical_switch.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/oneview-sdk/resource/api200/logical_switch.rb b/lib/oneview-sdk/resource/api200/logical_switch.rb
index aaae01867..a9df9691e 100644
--- a/lib/oneview-sdk/resource/api200/logical_switch.rb
+++ b/lib/oneview-sdk/resource/api200/logical_switch.rb
@@ -47,7 +47,6 @@ def create
       end
 
       # Reclaims the top-of-rack switches in a logical switch.
-      # @return [Hash] Http response body with logical switch data.
       def refresh_state
         response = @client.rest_put(@data['uri'] + '/refresh')
         @client.response_handler(response)