Merge pull request #429 from HewlettPackard/upgrade/800/os_deployment_plans

Upgrade/800/os deployment plans

Author: sijeesh

CHANGELOG.md

@@ -37,6 +37,7 @@ Resource data will be available with the resource object. This enhancement helps
 - Logical interconnect group
 - Logical switch group
 - Managed SAN
+- OS deployment plan
 - SAS interconnect
 - SAS interconnect type
 - SAS logical interconnect

endpoints-support.md

@@ -346,8 +346,8 @@
 |<sub>/rest/network-sets/{id}/withoutEthernet</sub>                                       | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
 |<sub>/rest/network-sets/{id}</sub>                                                       | PATCH    | :heavy_minus_sign:   | :white_check_mark:   | :white_check_mark:   | :heavy_minus_sign:   |
 |     **OS Deployment Plans**                                                                                                                      |
-|<sub>/rest/os-deployment-plans/</sub>                                                    | GET      | :heavy_minus_sign:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
-|<sub>/rest/os-deployment-plans/{id}</sub>                                                | GET      | :heavy_minus_sign:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
+|<sub>/rest/os-deployment-plans/</sub>                                                    | GET      | :heavy_minus_sign:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
+|<sub>/rest/os-deployment-plans/{id}</sub>                                                | GET      | :heavy_minus_sign:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
 |     **OS Deployment Servers**                                                                                                                      |
 |<sub>/rest/os-deployment-servers</sub>                                                   | GET      | :heavy_minus_sign:   | :white_check_mark:   |                      |
 |<sub>/rest/os-deployment-servers</sub>                                                   | POST     | :heavy_minus_sign:   | :white_check_mark:   |                      |

examples/os_deployment_plans.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ###
-# (C) Copyright (2012-2017) Hewlett Packard Enterprise Development LP
+# (C) Copyright (2012-2019) Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -34,26 +34,19 @@
     }
 }
 
-# To run this example you must define an OS Deployment Plan ID
-os_deployment_plan_id = "81decf85-0dff-4a5e-8a95-52994eeb6493"
-
 # Try load config from a file (if there is a config file)
 config = try_load_from_file(config)
-
 oneview_client = OneViewClient(config)
+os_deployment_plans = oneview_client.os_deployment_plans
 
 print("\nGet OS Deployment Plans by Filter:")
-os_deployment_plans = oneview_client.os_deployment_plans.get_by('deploymentType', 'I3S')
-pprint(os_deployment_plans)
+plans = os_deployment_plans.get_by('deploymentType', 'I3S')
+pprint(plans)
 
 print("\nGet the OS Deployment Plan by Name:")
-os_deployment_plans = oneview_client.os_deployment_plans.get_by_name('Deployment Plan')
-pprint(os_deployment_plans)
+os_deployment_plan = os_deployment_plans.get_by('name', 'Deployment Plan')
+pprint(os_deployment_plan)
 
 print("\nGet all OS Deployment Plans:")
-os_deployment_plans_all = oneview_client.os_deployment_plans.get_all()
+os_deployment_plans_all = os_deployment_plans.get_all()
 pprint(os_deployment_plans_all)
-
-print("\nGet an OS Deployment Plan by ID:")
-os_deployment_plan = oneview_client.os_deployment_plans.get(os_deployment_plan_id)
-pprint(os_deployment_plan)

hpOneView/oneview_client.py

@@ -1063,9 +1063,7 @@ def os_deployment_plans(self):
         Returns:
             OsDeploymentPlans:
         """
-        if not self.__os_deployment_plans:
-            self.__os_deployment_plans = OsDeploymentPlans(self.__connection)
-        return self.__os_deployment_plans
+        return OsDeploymentPlans(self.__connection)
 
     @property
     def os_deployment_servers(self):

hpOneView/resources/resource.py

@@ -965,8 +965,7 @@ def get_schema(self):
         Returns:
             A dict with the schema.
         """
-        resource_uri = self.data['uri']
-        return self._helper.do_get(resource_uri + '/schema')
+        return self._helper.do_get(self.URI + '/schema')
 
 
 class ResourceZeroBodyMixin(object):

hpOneView/resources/uncategorized/os_deployment_plans.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ###
-# (C) Copyright (2012-2017) Hewlett Packard Enterprise Development LP
+# (C) Copyright (2012-2019) Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -31,15 +31,14 @@
 standard_library.install_aliases()
 
 
-from hpOneView.resources.resource import ResourceClient
+from hpOneView.resources.resource import Resource, unavailable_method
 
 
-class OsDeploymentPlans(object):
+class OsDeploymentPlans(Resource):
     URI = '/rest/os-deployment-plans/'
 
-    def __init__(self, con):
-        self._connection = con
-        self._client = ResourceClient(con, self.URI)
+    def __init__(self, connection, data=None):
+        super(OsDeploymentPlans, self).__init__(connection, data)
 
     def get_all(self, start=0, count=-1, filter='', query='', sort=''):
         """
@@ -66,44 +65,16 @@ def get_all(self, start=0, count=-1, filter='', query='', sort=''):
         Returns:
              list: Os Deployment plans
         """
-        return self._client.get_all(start, count, filter=filter, sort=sort, query=query)
+        return self._helper.get_all(start, count, filter=filter, sort=sort, query=query)
 
-    def get(self, id_or_uri):
-        """
-        Gets a single Os Deployment plan resource based upon its URI or ID.
-
-        Args:
-            id_or_uri:
-                Can be either the Os Deployment plan ID or the URI
-
-        Returns:
-            dict: Os Deployment plan
-        """
-        return self._client.get(id_or_uri)
-
-    def get_by(self, field, value):
-        """
-        Gets all Os Deployment plans that match the filter
-        The search is case-insensitive
-
-        Args:
-            field: field name to filter
-            value: value to filter
+    def create(self):
+        """Create method not available for this resource"""
+        unavailable_method()
 
-        Returns:
-            list: Os Deployment plans
-        """
-        return self._client.get_by(field, value)
-
-    def get_by_name(self, name):
-        """
-        Gets the Os Deployment plan by name.
+    def update(self):
+        """Update method is not available for this resource"""
+        unavailable_method()
 
-        Args:
-            name: Name of the Os Deployment plan
-
-        Returns:
-            dict: Os Deployment plan
-        """
-        os_deployment_plan = self.get_by('name', name) or [None]
-        return os_deployment_plan[0]
+    def delete(self):
+        """Delete method is not avaialble for this resource"""
+        unavailable_method()

tests/unit/resources/uncategorized/test_os_deployment_plans.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ###
-# (C) Copyright (2012-2017) Hewlett Packard Enterprise Development LP
+# (C) Copyright (2012-2019) Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -26,7 +26,7 @@
 import mock
 
 from hpOneView.connection import connection
-from hpOneView.resources.resource import ResourceClient
+from hpOneView.resources.resource import ResourceHelper
 from hpOneView.resources.uncategorized.os_deployment_plans import OsDeploymentPlans
 
 
@@ -39,7 +39,7 @@ def setUp(self):
         self.connection = connection(self.host)
         self._os_deployment_plans = OsDeploymentPlans(self.connection)
 
-    @mock.patch.object(ResourceClient, 'get_all')
+    @mock.patch.object(ResourceHelper, 'get_all')
     def test_get_all_called_once(self, mock_get_all):
         filter = 'name=TestName'
         sort = 'name:ascending'
@@ -48,33 +48,24 @@ def test_get_all_called_once(self, mock_get_all):
 
         mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort, query='')
 
-    @mock.patch.object(ResourceClient, 'get_all')
+    @mock.patch.object(ResourceHelper, 'get_all')
     def test_get_all_called_once_with_default(self, mock_get_all):
         self._os_deployment_plans.get_all()
         mock_get_all.assert_called_once_with(0, -1, filter='', sort='', query='')
 
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_by_id_called_once(self, mock_get):
-        self._os_deployment_plans.get(self.RESOURCE_ID)
-        mock_get.assert_called_once_with(self.RESOURCE_ID)
-
-    @mock.patch.object(ResourceClient, 'get')
-    def test_get_by_uri_called_once(self, mock_get):
-        self._os_deployment_plans.get(self.RESOURCE_URI)
-        mock_get.assert_called_once_with(self.RESOURCE_URI)
-
-    @mock.patch.object(ResourceClient, 'get_by')
+    @mock.patch.object(ResourceHelper, 'get_all')
     def test_get_by_called_once(self, mock_get_by):
         self._os_deployment_plans.get_by("name", "test name")
-        mock_get_by.assert_called_once_with("name", "test name")
+        mock_get_by.assert_called_once_with(0, -1, filter='"name=\'test name\'"',
+                                            query='', sort='')
 
-    @mock.patch.object(ResourceClient, 'get_by')
+    @mock.patch.object(ResourceHelper, 'get_all')
     def test_get_by_name_sould_return_none_when_resource_is_not_found(self, mock_get_by):
         mock_get_by.return_value = []
         response = self._os_deployment_plans.get_by_name("test name")
         self.assertEqual(response, None)
 
-    @mock.patch.object(ResourceClient, 'get_by')
+    @mock.patch.object(ResourceHelper, 'get_all')
     def test_get_by_name_called_once(self, mock_get_by):
         self._os_deployment_plans.get_by_name("test name")
-        mock_get_by.assert_called_once_with("name", "test name")
+        mock_get_by.assert_called_once_with(0, -1, filter='"name=\'test name\'"', query='', sort='')

tests/unit/test_oneview_client.py

@@ -849,9 +849,9 @@ def test_lazy_loading_events(self):
     def test_os_deployment_plans_has_right_type(self):
         self.assertIsInstance(self._oneview.os_deployment_plans, OsDeploymentPlans)
 
-    def test_lazy_loading_os_deployment_plans(self):
-        os_deployment_plans = self._oneview.os_deployment_plans
-        self.assertEqual(os_deployment_plans, self._oneview.os_deployment_plans)
+    def test_os_deployment_plans_return(self):
+        self.assertNotEqual(self._oneview.os_deployment_plans,
+                            self._oneview.os_deployment_plans)
 
     def test_os_deployment_servers_has_right_type(self):
         self.assertIsInstance(self._oneview.os_deployment_servers, OsDeploymentServers)