diff options
| author |   Thomas Duval <thomas.duval@orange.com> | 2018-03-14 11:25:06 +0100 |
|---|---|---|
| committer | Thomas Duval <thomas.duval@orange.com> | 2018-03-15 10:47:03 +0100 |
| commit | d425d4edf13ed389cd34113bd9fd78eaa0a08c20 (patch) | |
| tree | 1ecfdf8a7f97f71748cf31e0ef45518997672993 /python_moondb | |
| parent | acb811aafc97d60cdcc71e0b9b2466fb00bfb097 (diff) | |
Fix bugs due to the modification of python_moondb
Change-Id: Id3855a6e8da9f8ef942c7a34a3e8da4f87be4c9e
Diffstat (limited to 'python_moondb')
| -rw-r--r-- | python_moondb/Changelog | 4 | ||||
| -rw-r--r-- | python_moondb/MANIFEST.in | 2 | ||||
| -rw-r--r-- | python_moondb/python_moondb/__init__.py | 2 | ||||
| -rw-r--r-- | python_moondb/python_moondb/api/policy.py | 1 | ||||
| -rw-r--r-- | python_moondb/python_moondb/backends/sql.py | 4 |
5 files changed, 9 insertions, 4 deletions
diff --git a/python_moondb/Changelog b/python_moondb/Changelog index b1e8e0ce..44ae7fa8 100644 --- a/python_moondb/Changelog +++ b/python_moondb/Changelog @@ -61,3 +61,7 @@ CHANGES ----- - Remove some code duplication in moon_db - handle the extra field for the perimeter + +1.2.7 +----- +- Fix some bugs diff --git a/python_moondb/MANIFEST.in b/python_moondb/MANIFEST.in index 82b40140..02655837 100644 --- a/python_moondb/MANIFEST.in +++ b/python_moondb/MANIFEST.in @@ -3,7 +3,7 @@ # license which can be found in the file 'LICENSE' in this package distribution # or at 'http://www.apache.org/licenses/LICENSE-2.0'. -include README.rst +include README.md include LICENSE include setup.py include requirements.txt diff --git a/python_moondb/python_moondb/__init__.py b/python_moondb/python_moondb/__init__.py index 8de4de66..bebaca8a 100644 --- a/python_moondb/python_moondb/__init__.py +++ b/python_moondb/python_moondb/__init__.py @@ -3,5 +3,5 @@ # license which can be found in the file 'LICENSE' in this package distribution # or at 'http://www.apache.org/licenses/LICENSE-2.0'. -__version__ = "1.2.6" +__version__ = "1.2.7" diff --git a/python_moondb/python_moondb/api/policy.py b/python_moondb/python_moondb/api/policy.py index ca313f9a..cde3ab77 100644 --- a/python_moondb/python_moondb/api/policy.py +++ b/python_moondb/python_moondb/api/policy.py @@ -112,6 +112,7 @@ class PolicyManager(Managers): @enforce(("read", "write"), "perimeter") def add_action(self, user_id, policy_id, perimeter_id=None, value=None): + logger.info("add_action {}".format(policy_id)) if not self.get_policies(user_id=user_id, policy_id=policy_id): raise exceptions.PolicyUnknown if not perimeter_id: diff --git a/python_moondb/python_moondb/backends/sql.py b/python_moondb/python_moondb/backends/sql.py index a8e7740b..c0670951 100644 --- a/python_moondb/python_moondb/backends/sql.py +++ b/python_moondb/python_moondb/backends/sql.py @@ -892,7 +892,7 @@ class ModelConnector(BaseConnector, ModelDriver): return self.__add_perimeter_category(ObjectCategory, name, description, uuid=uuid) def delete_object_category(self, category_id): - self.__delete_perimeter_category(SubjectCategory, category_id) + self.__delete_perimeter_category(ObjectCategory, category_id) def get_action_categories(self, category_id=None): return self.__get_perimeter_categories(ActionCategory, category_id=category_id) @@ -901,7 +901,7 @@ class ModelConnector(BaseConnector, ModelDriver): return self.__add_perimeter_category(ActionCategory, name, description, uuid=uuid) def delete_action_category(self, category_id): - self.__delete_perimeter_category(SubjectCategory, category_id) + self.__delete_perimeter_category(ActionCategory, category_id) # Getter and Setter for subject_category |