From 023292b59c144d60745cbbb3810127b158c1bdf5 Mon Sep 17 00:00:00 2001
From: Mike Dorman <mdorman@godaddy.com>
Date: Fri, 8 Jan 2016 10:52:07 -0700
Subject: [PATCH] Rename admin_state_up method to avoid conflict with accessor

The admin_state_up(value) method conflicts with the accessor method
for the admin_state_up resource parameter.  This patch renames
it to set_admin_state_up(value) to avoid this conflict.

Change-Id: I5a1e23c1541d7ed815ea37f1972abc345e2ba984
Closes-bug: 1532282
---
 lib/puppet/provider/neutron_router/neutron.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/puppet/provider/neutron_router/neutron.rb b/lib/puppet/provider/neutron_router/neutron.rb
index c9dcccf77..6b3988185 100644
--- a/lib/puppet/provider/neutron_router/neutron.rb
+++ b/lib/puppet/provider/neutron_router/neutron.rb
@@ -142,30 +142,30 @@ EOT
   end
 
   def admin_state_up=(value)
-    admin_state_up(value)
+    set_admin_state_up(value)
   end
 
-  def admin_state_up(value)
+  def set_admin_state_up(value)
     auth_neutron('router-update', "--admin-state-up=#{value}", name)
   end
 
   def distributed=(value)
     results = auth_neutron("router-show", '--format=shell', resource[:name])
     attrs = self.class.parse_creation_output(results)
-    admin_state_up(false)
+    set_admin_state_up(false)
     auth_neutron('router-update', "--distributed=#{value}", name)
     if attrs['admin_state_up'] == 'True'
-      admin_state_up(true)
+      set_admin_state_up(true)
     end
   end
 
   def ha=(value)
     results = auth_neutron("router-show", '--format=shell', resource[:name])
     attrs = self.class.parse_creation_output(results)
-    admin_state_up(false)
+    set_admin_state_up(false)
     auth_neutron('router-update', "--ha=#{value}", name)
     if attrs['admin_state_up'] == 'True'
-      admin_state_up(true)
+      set_admin_state_up(true)
     end
   end