openstack/octavia
Code Issues Proposed changes

Remove datetime_to_str

Browse Source 
There is no need to convert datetime object to string at all.

Closes-Bug: 1606798

Change-Id: Id2fed212185da48ada96e68e69489d7269d71e4c
This commit is contained in:
chen-li 2016-07-27 02:33:30 -05:00
parent 5f1942259b
commit a00d60e6f5
6 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octavia/api/v1/types/listener.py
View File

@ -45,8 +45,8 @@ class ListenerResponse(base.BaseType):
default_pool = wtypes.wsattr(pool.PoolResponse)
l7policies = wtypes.wsattr([l7policy.L7PolicyResponse])
insert_headers = wtypes.wsattr(wtypes.DictType(str, str))
created_at = wtypes.wsattr(wtypes.StringType())
updated_at = wtypes.wsattr(wtypes.StringType())
created_at = wtypes.wsattr(wtypes.datetime.datetime)
updated_at = wtypes.wsattr(wtypes.datetime.datetime)
@classmethod
def from_data_model(cls, data_model, children=False):

4
octavia/api/v1/types/load_balancer.py
View File

@ -36,8 +36,8 @@ class LoadBalancerResponse(base.BaseType):
vip = wtypes.wsattr(VIP)
project_id = wtypes.wsattr(wtypes.StringType())
listeners = wtypes.wsattr([listener.ListenerResponse])
created_at = wtypes.wsattr(wtypes.StringType())
updated_at = wtypes.wsattr(wtypes.StringType())
created_at = wtypes.wsattr(wtypes.datetime.datetime)
updated_at = wtypes.wsattr(wtypes.datetime.datetime)
@classmethod
def from_data_model(cls, data_model, children=False):

4
octavia/api/v1/types/member.py
View File

@ -27,8 +27,8 @@ class MemberResponse(base.BaseType):
weight = wtypes.wsattr(wtypes.IntegerType())
subnet_id = wtypes.wsattr(wtypes.UuidType())
project_id = wtypes.wsattr(wtypes.StringType())
created_at = wtypes.wsattr(wtypes.StringType())
updated_at = wtypes.wsattr(wtypes.StringType())
created_at = wtypes.wsattr(wtypes.datetime.datetime)
updated_at = wtypes.wsattr(wtypes.datetime.datetime)
class MemberPOST(base.BaseType):

4
octavia/api/v1/types/pool.py
View File

@ -52,8 +52,8 @@ class PoolResponse(base.BaseType):
project_id = wtypes.wsattr(wtypes.StringType())
health_monitor = wtypes.wsattr(health_monitor.HealthMonitorResponse)
members = wtypes.wsattr([member.MemberResponse])
created_at = wtypes.wsattr(wtypes.StringType())
updated_at = wtypes.wsattr(wtypes.StringType())
created_at = wtypes.wsattr(wtypes.datetime.datetime)
updated_at = wtypes.wsattr(wtypes.datetime.datetime)
@classmethod
def from_data_model(cls, data_model, children=False):

9
octavia/db/base_models.py
View File

@ -14,18 +14,11 @@
from oslo_db.sqlalchemy import models
from oslo_utils import uuidutils
import six
import sqlalchemy as sa
from sqlalchemy.ext import declarative
from sqlalchemy.orm import collections
def datetime_to_str(dct, attr_name):
if (dct.get(attr_name) is not None
and not isinstance(dct.get(attr_name), six.string_types)):
dct[attr_name] = dct[attr_name].isoformat(' ')
class OctaviaBase(models.ModelBase):
__data_model__ = None
@ -71,8 +64,6 @@ class OctaviaBase(models.ModelBase):
dm_kwargs = {}
for column in self.__table__.columns:
dm_kwargs[column.name] = getattr(self, column.name)
datetime_to_str(dm_kwargs, 'created_at')
datetime_to_str(dm_kwargs, 'updated_at')
attr_names = [attr_name for attr_name in dir(self)
if not attr_name.startswith('_')]

3
octavia/db/repositories.py
View File

@ -352,9 +352,6 @@ class LoadBalancerRepository(BaseRepository):
if lb:
# If a load balancer was never updated use its creation timestamp
last_update = lb.updated_at or lb.created_at
# Convert string to timestamp
last_update = datetime.datetime.strptime(last_update,
"%Y-%m-%d %H:%M:%S.%f")
return last_update < timestamp
else:
# Load balancer was just deleted.