x
/
poppy
Code Issues Proposed changes

Fixes bugs missing session keyword and cassandra ordered dict 

Change-Id: Iee21d2e136752af2597b839857ea66697031d030
This commit is contained in:
Obulpathi 2014-12-22 12:18:39 -05:00
parent f21174a149
commit 1deddc4c25
3 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
poppy/storage/cassandra/services.py
View File

@ -15,6 +15,10 @@
import datetime
import json
try:
import ordereddict as collections
except ImportError: # pragma: no cover
import collections # pragma: no cover
from poppy.model.helpers import cachingrule
from poppy.model.helpers import domain
@ -367,14 +371,21 @@ class ServicesController(base.ServicesController):
"""
provider_detail_dict = {}
for provider_name in provider_details:
provider_detail_dict[provider_name] = json.dumps({
"id": provider_details[provider_name].provider_service_id,
"access_urls": provider_details[provider_name].access_urls,
"status": provider_details[provider_name].status,
"name": provider_details[provider_name].name,
"error_info": provider_details[provider_name].error_info,
"error_message": provider_details[provider_name].error_message
})
the_provider_detail_dict = collections.OrderedDict()
the_provider_detail_dict["id"] = (
provider_details[provider_name].provider_service_id)
the_provider_detail_dict["access_urls"] = (
provider_details[provider_name].access_urls)
the_provider_detail_dict["status"] = (
provider_details[provider_name].status)
the_provider_detail_dict["name"] = (
provider_details[provider_name].name)
the_provider_detail_dict["error_info"] = (
provider_details[provider_name].error_info)
the_provider_detail_dict["error_message"] = (
provider_details[provider_name].error_message)
provider_detail_dict[provider_name] = json.dumps(
the_provider_detail_dict)
args = {
'project_id': project_id,
'service_name': service_name,

5
setup.py
View File

@ -20,6 +20,8 @@ import os
import pip
import setuptools
pip_session = pip.download.PipSession(retries=3)
requirement_files = []
# walk the requirements directory and gather requirement files
for root, dirs, files in os.walk('requirements'):
@ -27,7 +29,8 @@ for root, dirs, files in os.walk('requirements'):
requirements_file_path = os.path.join(root, requirements_file)
# parse_requirements() returns generator of requirement objects
requirement_files.append(
pip.req.parse_requirements(requirements_file_path))
pip.req.parse_requirements(requirements_file_path,
session=pip_session))
# parse all requirement files and generate requirements
requirements = set()

28
tests/unit/storage/cassandra/test_services.py
View File

@ -14,6 +14,10 @@
# limitations under the License.
import json
try:
import ordereddict as collections
except ImportError: # pragma: no cover
import collections # pragma: no cover
import cassandra
import ddt
@ -177,15 +181,21 @@ class CassandraStorageServiceTests(base.TestCase):
# this is for update_provider_details unittest code coverage
arg_provider_details_dict = {}
for provider_name in provider_details_dict:
arg_provider_details_dict[provider_name] = json.dumps({
"id": provider_details_dict[provider_name].provider_service_id,
"access_urls": (
provider_details_dict[provider_name].access_urls),
"status": provider_details_dict[provider_name].status,
"name": provider_details_dict[provider_name].name,
"error_message": None,
"error_info": None
})
the_provider_detail_dict = collections.OrderedDict()
the_provider_detail_dict["id"] = (
provider_details_dict[provider_name].provider_service_id)
the_provider_detail_dict["access_urls"] = (
provider_details_dict[provider_name].access_urls)
the_provider_detail_dict["status"] = (
provider_details_dict[provider_name].status)
the_provider_detail_dict["name"] = (
provider_details_dict[provider_name].name)
the_provider_detail_dict["error_info"] = (
provider_details_dict[provider_name].error_info)
the_provider_detail_dict["error_message"] = (
provider_details_dict[provider_name].error_message)
arg_provider_details_dict[provider_name] = json.dumps(
the_provider_detail_dict)
args = {
'project_id': self.project_id,
'service_name': self.service_name,