openstack/cyborg
Code Issues Proposed changes

Merge "Add created_time and update_time for device profile API"

Browse Source
This commit is contained in:
Zuul 2020-01-14 08:38:37 +00:00 committed by Gerrit Code Review
commit 47ebab753c
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyborg/api/controllers/v2/device_profiles.py
View File

@ -65,6 +65,8 @@ class DeviceProfile(base.APIBase):
# TODO(Sundar) add description field in db, objects and here
for field in ['name', 'uuid', 'groups']:
api_obj[field] = obj_devprof[field]
for field in ['created_at', 'updated_at']:
api_obj[field] = str(obj_devprof[field])
api_obj['links'] = [
link.Link.make_link_dict('device_profiles', api_obj['uuid'])
]

2
cyborg/tests/unit/api/controllers/v2/test_device_profiles.py
View File

@ -76,6 +76,7 @@ class TestDeviceProfileController(v2_test.APITestV2):
ct = self.gen_context(value)
headers = self.gen_headers(ct)
dp = [self.fake_dps[0]]
dp[0]['created_at'] = str(dp[0]['created_at'])
exc = None
try:
self.post_json(self.DP_URL, dp, headers=headers)
@ -89,6 +90,7 @@ class TestDeviceProfileController(v2_test.APITestV2):
def test_create(self, mock_cond_dp):
dp = [self.fake_dps[0]]
mock_cond_dp.return_value = self.fake_dp_objs[0]
dp[0]['created_at'] = str(dp[0]['created_at'])
response = self.post_json(self.DP_URL, dp, headers=self.headers)
out_dp = jsonutils.loads(response.controller_output)

12
cyborg/tests/unit/fake_device_profile.py
View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
import datetime
from oslo_serialization import jsonutils
from cyborg.objects import device_profile
@ -25,10 +27,18 @@ from cyborg.objects import device_profile
def _get_device_profiles_as_dict():
date1 = datetime.datetime(
2019, 10, 9, 6, 31, 59,
tzinfo=datetime.timezone.utc)
date2 = datetime.datetime(
2019, 11, 8, 5, 30, 49,
tzinfo=datetime.timezone.utc)
dp1 = {
"id": 1,
"uuid": u"a95e10ae-b3e3-4eab-a513-1afae6f17c51",
"name": u'afaas_example_1',
"created_at": date1,
"updated_at": None,
"groups": [
{"resources:ACCELERATOR_FPGA": "1",
"trait:CUSTOM_FPGA_INTEL_PAC_ARRIA10": "required",
@ -43,6 +53,8 @@ def _get_device_profiles_as_dict():
"id": 2,
"uuid": u"199c46b7-63a7-431b-aa40-35da4b9420b1",
"name": u'daas_example_1',
"created_at": date2,
"updated_at": None,
"groups": [
{"resources:ACCELERATOR_FPGA": "1",
"trait:CUSTOM_REGION_ID_3ACD": "required",