Merge branch 'dev'

Author: JosepSampe

.travis.yml

@@ -11,7 +11,7 @@ install:
 - pip install -r requirements.txt
 - pip install -r test-requirements.txt
 script:
-- cd api/ && coverage run --source='.' manage.py test
+- cd api/ && coverage run --omit='*/actors/*' --source='.' manage.py test
 after_success: coveralls
 notifications:
  slack:

api/filters/tests.py

@@ -8,7 +8,7 @@
 from rest_framework import status
 from rest_framework.test import APIRequestFactory
 
-from .views import dependency_list, dependency_detail, filter_list, filter_detail, filter_deploy, unset_filter, FilterData
+from .views import dependency_list, dependency_detail, filter_list, filter_detail, filter_deploy, unset_filter, FilterData, DependencyData, filter_undeploy, dependency_deploy
 from policies.views import slo_list, slo_detail
 
 
@@ -195,6 +195,11 @@ def mock_put_object_status_created(url, token=None, container=None, name=None, c
  content_type=None, headers=None, http_conn=None, proxy=None,
  query_string=None, response_dict=None):
  response_dict['status'] = status.HTTP_201_CREATED
+ 
+ def test_filter_detail_get(self):
+ request = self.factory.get('/filters/fake')
+ response = filter_detail(request, 'fake')
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
 
  @mock.patch('filters.views.swift_client.put_object', side_effect=mock_put_object_status_created)
  def test_filter_deploy_to_project_ok(self, mock_put_object):
@@ -245,6 +250,11 @@ def test_filter_deploy_to_project_and_container_ok(self, mock_put_object):
  dumped_data = self.r.hget("pipeline:0123456789abcdef:container1", "1")
  json_data = json.loads(dumped_data)
  self.assertEqual(json_data["filter_name"], "test-1.0.jar")
+ 
+ @mock.patch('filters.views.unset_filter')
+ def test_filter_undeploy(self, mock_unset_filter):
+ request = self.factory.put('/filters/projectid/containerid/swiftobject/undeploy/1')
+ response = filter_undeploy(request, 'fake', 'projectid') 
 
  def test_get_all_dependencies_ok(self):
  request = self.factory.get('/filters/dependencies')
@@ -308,6 +318,17 @@ def test_delete_dependency_ok(self):
  self.assertEqual(response.status_code, status.HTTP_200_OK)
  dependencies = json.loads(response.content)
  self.assertEqual(len(dependencies), 0)
+ 
+ 
+ @mock.patch('filters.views.swift_client')
+ @mock.patch('filters.views.open')
+ @mock.patch('filters.views.dict')
+ def test_dependendy_deploy(self, mock_dict, mock_open, mock_swift_client):
+ dependency_id = 1
+ request = self.factory.put('/filters/dependencies/projectid/deploy/' + str(dependency_id))
+ mock_dict.return_value = {'status': 201}
+ response = dependency_deploy(request, dependency_id, 'projectid')
+ self.assertEqual(response.status_code, 201)
 
  @mock.patch('filters.views.swift_client.delete_object')
  def test_unset_filter_ok(self, mock_delete_object):
@@ -450,7 +471,7 @@ def create_storlet(self):
  self.assertEqual(response.status_code, status.HTTP_201_CREATED)
 
  def create_dependency(self):
- dependency_data = {'name': 'DependencyName', 'version': '1.0', 'permissions': '0755'}
+ dependency_data = {'name': 'DependencyName', 'version': '1.0', 'permissions': '0755', 'path': 'foo'}
  request = self.factory.post('/filters/dependencies', dependency_data, format='json')
  response = dependency_list(request)
  self.assertEqual(response.status_code, status.HTTP_201_CREATED)

api/filters/views.py

@@ -514,7 +514,7 @@ def set_filter(r, target, filter_data, parameters, token):
  }
 
  try:
- project_id = target.split('/', 3)[0]
+ project_id = target.split(':')[0]
 
  if project_id == 'global':
  projects_crystal_enabled = r.lrange('projects_crystal_enabled', 0, -1)

api/policies/tests.py

@@ -562,7 +562,7 @@ def test_access_control_get_ok(self, mock_get_project_list):
  def test_access_control_post_list_ok(self, mock_get_project_list):
  mock_get_project_list.return_value = {'0123456789abcdef': 'tenantA', 'abcdef0123456789': 'tenantB'}
 
- acl_data = {'project_id': '0123456789abcdef', 'container_id': 'container2', 'identity': 'user_id:a1a1a1a1a1a1', 'access': 'list'}
+ acl_data = {'project_id': '0123456789abcdef', 'container_id': 'container2', 'identity': 'user_id:a1a1a1a1a1a1', 'access': 'list', 'object_type': 'DOCS'}
  request = self.factory.post('/policies/acl/', acl_data, format='json')
  response = access_control(request)
  self.assertEqual(response.status_code, status.HTTP_201_CREATED)
@@ -578,7 +578,7 @@ def test_access_control_post_list_ok(self, mock_get_project_list):
  def test_access_control_post_read_group_ok(self, mock_get_project_list):
  mock_get_project_list.return_value = {'0123456789abcdef': 'tenantA', 'abcdef0123456789': 'tenantB'}
 
- acl_data = {'project_id': '0123456789abcdef', 'container_id': 'container2', 'identity': 'group_id:g2g2g2', 'access': 'read'}
+ acl_data = {'project_id': '0123456789abcdef', 'container_id': 'container2', 'identity': 'group_id:g2g2g2', 'access': 'read', 'object_type': 'DOCS'}
  request = self.factory.post('/policies/acl/', acl_data, format='json')
  response = access_control(request)
  self.assertEqual(response.status_code, status.HTTP_201_CREATED)