Merge "Update apiclient.base and reuse new functional"

5 files changed, 2 insertions, 22 deletions

diff --git a/heatclient/v1/events.py b/heatclient/v1/events.py
index 161de39..cb24664 100644
--- a/heatclient/v1/events.py
+++ b/heatclient/v1/events.py
@@ -12,7 +12,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import copy
 
 from heatclient.openstack.common.apiclient import base
 from heatclient.openstack.common.py3kcompat import urlutils
@@ -35,9 +34,6 @@ class Event(base.Resource):
     def data(self, **kwargs):
         return self.manager.data(self, **kwargs)
 
-    def to_dict(self):
-        return copy.deepcopy(self._info)
-
 
 class EventManager(stacks.StackChildManager):
     resource_class = Event
diff --git a/heatclient/v1/resources.py b/heatclient/v1/resources.py
index 1eab853..10dd5f4 100644
--- a/heatclient/v1/resources.py
+++ b/heatclient/v1/resources.py
@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import copy
-
 from heatclient.openstack.common.apiclient import base
 from heatclient.openstack.common.py3kcompat import urlutils
 from heatclient.openstack.common import strutils
@@ -36,9 +34,6 @@ class Resource(base.Resource):
     def data(self, **kwargs):
         return self.manager.data(self, **kwargs)
 
-    def to_dict(self):
-        return copy.deepcopy(self._info)
-
 
 class ResourceManager(stacks.StackChildManager):
     resource_class = Resource
diff --git a/heatclient/v1/software_configs.py b/heatclient/v1/software_configs.py
index 9fa77d3..cf038db 100644
--- a/heatclient/v1/software_configs.py
+++ b/heatclient/v1/software_configs.py
@@ -9,7 +9,6 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import copy
 
 from heatclient.openstack.common.apiclient import base
 
@@ -24,9 +23,6 @@ class SoftwareConfig(base.Resource):
     def data(self, **kwargs):
         return self.manager.data(self, **kwargs)
 
-    def to_dict(self):
-        return copy.deepcopy(self._info)
-
 
 class SoftwareConfigManager(base.BaseManager):
     resource_class = SoftwareConfig
diff --git a/heatclient/v1/software_deployments.py b/heatclient/v1/software_deployments.py
index 2a17868..4bbdf3d 100644
--- a/heatclient/v1/software_deployments.py
+++ b/heatclient/v1/software_deployments.py
@@ -9,7 +9,6 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-import copy
 
 from heatclient.openstack.common.apiclient import base
 from heatclient.openstack.common.py3kcompat import urlutils
@@ -25,9 +24,6 @@ class SoftwareDeployment(base.Resource):
     def delete(self):
         return self.manager.delete(deployment_id=self.id)
 
-    def to_dict(self):
-        return copy.deepcopy(self._info)
-
 
 class SoftwareDeploymentManager(base.BaseManager):
     resource_class = SoftwareDeployment
diff --git a/heatclient/v1/stacks.py b/heatclient/v1/stacks.py
index efbbef7..2d1ba6d 100644
--- a/heatclient/v1/stacks.py
+++ b/heatclient/v1/stacks.py
@@ -12,7 +12,7 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import copy
+
 import six
 
 from heatclient.openstack.common.apiclient import base
@@ -37,7 +37,7 @@ class Stack(base.Resource):
 
     def get(self):
         # set_loaded() first ... so if we have to bail, we know we tried.
-        self.set_loaded(True)
+        self._loaded = True
         if not hasattr(self.manager, 'get'):
             return
 
@@ -61,9 +61,6 @@ class Stack(base.Resource):
     def identifier(self):
         return '%s/%s' % (self.stack_name, self.id)
 
-    def to_dict(self):
-        return copy.deepcopy(self._info)
-
 
 class StackManager(base.BaseManager):
     resource_class = Stack