Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bugfix: fail to generate APIs document patch
[releng.git]
/
utils
/
test
/
testapi
/
opnfv_testapi
/
resources
/
scenario_models.py
diff --git
a/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
b/utils/test/testapi/opnfv_testapi/resources/scenario_models.py
index
9f5a074
..
c6da76b
100644
(file)
--- a/
utils/test/testapi/opnfv_testapi/resources/scenario_models.py
+++ b/
utils/test/testapi/opnfv_testapi/resources/scenario_models.py
@@
-16,6
+16,13
@@
class ScenarioTI(models.ModelBase):
self.date = date
self.status = status
self.date = date
self.status = status
+ def __eq__(self, other):
+ return (self.date == other.date and
+ self.status == other.status)
+
+ def __ne__(self, other):
+ return not self.__eq__(other)
+
@swagger.model()
class ScenarioScore(models.ModelBase):
@swagger.model()
class ScenarioScore(models.ModelBase):
@@
-23,6
+30,13
@@
class ScenarioScore(models.ModelBase):
self.date = date
self.score = score
self.date = date
self.score = score
+ def __eq__(self, other):
+ return (self.date == other.date and
+ self.score == other.score)
+
+ def __ne__(self, other):
+ return not self.__eq__(other)
+
@swagger.model()
class ScenarioProject(models.ModelBase):
@swagger.model()
class ScenarioProject(models.ModelBase):
@@
-50,10
+64,10
@@
class ScenarioProject(models.ModelBase):
'trust_indicators': ScenarioTI}
def __eq__(self, other):
'trust_indicators': ScenarioTI}
def __eq__(self, other):
- return
[
self.project == other.project and
+ return
(
self.project == other.project and
self._customs_eq(other) and
self._scores_eq(other) and
self._customs_eq(other) and
self._scores_eq(other) and
- self._ti_eq(other)
]
+ self._ti_eq(other)
)
def __ne__(self, other):
return not self.__eq__(other)
def __ne__(self, other):
return not self.__eq__(other)
@@
-62,10
+76,10
@@
class ScenarioProject(models.ModelBase):
return set(self.customs) == set(other.customs)
def _scores_eq(self, other):
return set(self.customs) == set(other.customs)
def _scores_eq(self, other):
- return se
t(self.scores) == set(other.scores)
+ return se
lf.scores == other.scores
def _ti_eq(self, other):
def _ti_eq(self, other):
- return se
t(self.trust_indicators) == set(other.trust_indicators)
+ return se
lf.trust_indicators == other.trust_indicators
@swagger.model()
@swagger.model()
@@
-74,7
+88,8
@@
class ScenarioVersion(models.ModelBase):
@property projects:
@ptype projects: C{list} of L{ScenarioProject}
"""
@property projects:
@ptype projects: C{list} of L{ScenarioProject}
"""
- def __init__(self, version=None, projects=None):
+ def __init__(self, owner=None, version=None, projects=None):
+ self.owner = owner
self.version = version
self.projects = list_default(projects)
self.version = version
self.projects = list_default(projects)
@@
-83,7
+98,9
@@
class ScenarioVersion(models.ModelBase):
return {'projects': ScenarioProject}
def __eq__(self, other):
return {'projects': ScenarioProject}
def __eq__(self, other):
- return [self.version == other.version and self._projects_eq(other)]
+ return (self.version == other.version and
+ self.owner == other.owner and
+ self._projects_eq(other))
def __ne__(self, other):
return not self.__eq__(other)
def __ne__(self, other):
return not self.__eq__(other)
@@
-113,7
+130,7
@@
class ScenarioInstaller(models.ModelBase):
return {'versions': ScenarioVersion}
def __eq__(self, other):
return {'versions': ScenarioVersion}
def __eq__(self, other):
- return
[self.installer == other.installer and self._versions_eq(other)]
+ return
(self.installer == other.installer and self._versions_eq(other))
def __ne__(self, other):
return not self.__eq__(other)
def __ne__(self, other):
return not self.__eq__(other)
@@
-143,6
+160,12
@@
class ScenarioCreateRequest(models.ModelBase):
return {'installers': ScenarioInstaller}
return {'installers': ScenarioInstaller}
+@swagger.model()
+class ScenarioChangeOwnerRequest(models.ModelBase):
+ def __init__(self, owner=None):
+ self.owner = owner
+
+
@swagger.model()
class Scenario(models.ModelBase):
"""
@swagger.model()
class Scenario(models.ModelBase):
"""
@@
-163,7
+186,7
@@
class Scenario(models.ModelBase):
return not self.__eq__(other)
def __eq__(self, other):
return not self.__eq__(other)
def __eq__(self, other):
- return
[self.name == other.name and self._installers_eq(other)]
+ return
(self.name == other.name and self._installers_eq(other))
def _installers_eq(self, other):
for s_install in self.installers:
def _installers_eq(self, other):
for s_install in self.installers: