Merge "Moving Sahara to contrib"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
d49f66935c
@ -42,7 +42,6 @@ from openstack_dashboard.api import lbaas
|
||||
from openstack_dashboard.api import network
|
||||
from openstack_dashboard.api import neutron
|
||||
from openstack_dashboard.api import nova
|
||||
from openstack_dashboard.api import sahara
|
||||
from openstack_dashboard.api import swift
|
||||
from openstack_dashboard.api import trove
|
||||
from openstack_dashboard.api import vpn
|
||||
@ -63,5 +62,4 @@ __all__ = [
|
||||
"ceilometer",
|
||||
"trove",
|
||||
"vpn",
|
||||
"sahara",
|
||||
]
|
||||
|
||||
5
openstack_dashboard/contrib/sahara/api/__init__.py
Normal file
5
openstack_dashboard/contrib/sahara/api/__init__.py
Normal file
@ -0,0 +1,5 @@
|
||||
from openstack_dashboard.contrib.sahara.api import sahara
|
||||
|
||||
__all__ = [
|
||||
"sahara"
|
||||
]
|
||||
@ -18,8 +18,8 @@ from django.utils.translation import ugettext_lazy as _
|
||||
from horizon import exceptions
|
||||
from horizon import forms
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
utils import workflow_helpers
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -21,7 +21,7 @@ from django.utils.translation import ungettext_lazy
|
||||
|
||||
from horizon import tables
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -19,8 +19,8 @@ from horizon import exceptions
|
||||
from horizon import tabs
|
||||
|
||||
from openstack_dashboard.api import nova
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.dashboards.project. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.utils import workflow_helpers as helpers
|
||||
|
||||
|
||||
@ -15,7 +15,8 @@ from django import http
|
||||
|
||||
from mox3.mox import IsA # noqa
|
||||
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard import api as dash_api
|
||||
from openstack_dashboard.contrib.sahara import api
|
||||
from openstack_dashboard.test import helpers as test
|
||||
|
||||
|
||||
@ -38,11 +39,11 @@ class DataProcessingClusterTemplateTests(test.TestCase):
|
||||
self.assertContains(res, 'Name')
|
||||
|
||||
@test.create_stubs({api.sahara: ('cluster_template_get',),
|
||||
api.nova: ('flavor_get',)})
|
||||
dash_api.nova: ('flavor_get',)})
|
||||
def test_details(self):
|
||||
flavor = self.flavors.first()
|
||||
ct = self.cluster_templates.first()
|
||||
api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \
|
||||
dash_api.nova.flavor_get(IsA(http.HttpRequest), flavor.id) \
|
||||
.MultipleTimes().AndReturn(flavor)
|
||||
api.sahara.cluster_template_get(IsA(http.HttpRequest),
|
||||
IsA(unicode)) \
|
||||
@ -14,7 +14,7 @@
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
|
||||
import openstack_dashboard.dashboards.project. \
|
||||
import openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.cluster_templates.views as views
|
||||
|
||||
|
||||
@ -24,16 +24,16 @@ from horizon.utils import memoized
|
||||
from horizon.utils.urlresolvers import reverse # noqa
|
||||
from horizon import workflows
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates import forms as cluster_forms
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.tables as ct_tables
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.tabs as _tabs
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.workflows.copy as copy_flow
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.workflows.create as create_flow
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -19,10 +19,10 @@ from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import exceptions
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.workflows.create as create_flow
|
||||
import openstack_dashboard.dashboards.project.data_processing.utils. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing.utils. \
|
||||
workflow_helpers as wf_helpers
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -21,12 +21,12 @@ from saharaclient.api import base as api_base
|
||||
from horizon import exceptions
|
||||
from horizon import forms
|
||||
from horizon import workflows
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
utils import helpers as helpers
|
||||
from openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
utils import anti_affinity as aa
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
utils.workflow_helpers as whelpers
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ from horizon import messages
|
||||
from horizon import tables
|
||||
from horizon.tables import base as tables_base
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
from saharaclient.api import base as api_base
|
||||
|
||||
@ -19,7 +19,7 @@ from horizon import exceptions
|
||||
from horizon import tables
|
||||
from horizon import tabs
|
||||
|
||||
from openstack_dashboard.dashboards.project. \
|
||||
from openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.utils import workflow_helpers as helpers
|
||||
|
||||
from openstack_dashboard.api import glance
|
||||
@ -27,7 +27,7 @@ from openstack_dashboard.api import network
|
||||
from openstack_dashboard.api import neutron
|
||||
from openstack_dashboard.api import nova
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -15,7 +15,7 @@ from django import http
|
||||
|
||||
from mox3.mox import IsA # noqa
|
||||
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard.contrib.sahara import api
|
||||
from openstack_dashboard.test import helpers as test
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
clusters.views as views
|
||||
|
||||
|
||||
@ -22,15 +22,15 @@ from horizon.utils import memoized
|
||||
from horizon.utils.urlresolvers import reverse # noqa
|
||||
from horizon import workflows
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
import openstack_dashboard.dashboards.project.data_processing.clusters. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing.clusters. \
|
||||
tables as c_tables
|
||||
import openstack_dashboard.dashboards.project.data_processing.clusters.tabs \
|
||||
as _tabs
|
||||
import openstack_dashboard.dashboards.project.data_processing.clusters. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing.clusters. \
|
||||
tabs as _tabs
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing.clusters. \
|
||||
workflows.create as create_flow
|
||||
import openstack_dashboard.dashboards.project.data_processing.clusters. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing.clusters. \
|
||||
workflows.scale as scale_flow
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -17,16 +17,16 @@ from horizon import workflows
|
||||
|
||||
from openstack_dashboard.api import nova
|
||||
|
||||
from openstack_dashboard.dashboards.project.data_processing.utils \
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing.utils \
|
||||
import neutron_support
|
||||
import openstack_dashboard.dashboards.project.data_processing.utils. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing.utils. \
|
||||
workflow_helpers as whelpers
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
cluster_templates. workflows.create as t_flows
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.workflows.create as t_flows
|
||||
|
||||
from saharaclient.api import base as api_base
|
||||
|
||||
@ -19,12 +19,12 @@ from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import exceptions
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
cluster_templates.workflows.create as clt_create_flow
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
clusters.workflows.create as cl_create_flow
|
||||
from openstack_dashboard.dashboards.project.data_processing.utils \
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing.utils \
|
||||
import workflow_helpers
|
||||
|
||||
from saharaclient.api import base as api_base
|
||||
@ -19,7 +19,7 @@ from horizon import exceptions
|
||||
from horizon import forms
|
||||
from horizon import messages
|
||||
from openstack_dashboard.api import glance
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
|
||||
class ImageForm(forms.SelfHandlingForm):
|
||||
@ -19,7 +19,7 @@ from django.utils.translation import ungettext_lazy
|
||||
|
||||
from horizon import tables
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -15,7 +15,8 @@ from django import http
|
||||
|
||||
from mox3.mox import IsA # noqa
|
||||
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard import api as dash_api
|
||||
from openstack_dashboard.contrib.sahara import api
|
||||
from openstack_dashboard.test import helpers as test
|
||||
|
||||
|
||||
@ -45,7 +46,7 @@ class DataProcessingImageRegistryTests(test.TestCase):
|
||||
'image_update',
|
||||
'image_tags_update',
|
||||
'image_list'),
|
||||
api.glance: ('image_list_detailed',)})
|
||||
dash_api.glance: ('image_list_detailed',)})
|
||||
def test_register(self):
|
||||
image = self.images.first()
|
||||
image_id = image.id
|
||||
@ -53,9 +54,9 @@ class DataProcessingImageRegistryTests(test.TestCase):
|
||||
test_description = 'mydescription'
|
||||
api.sahara.image_get(IsA(http.HttpRequest),
|
||||
image_id).MultipleTimes().AndReturn(image)
|
||||
api.glance.image_list_detailed(IsA(http.HttpRequest),
|
||||
filters={'owner': self.user.id,
|
||||
'status': 'active'}) \
|
||||
dash_api.glance.image_list_detailed(IsA(http.HttpRequest),
|
||||
filters={'owner': self.user.id,
|
||||
'status': 'active'}) \
|
||||
.AndReturn((self.images.list(), False, False))
|
||||
api.sahara.image_update(IsA(http.HttpRequest),
|
||||
image_id,
|
||||
@ -15,7 +15,7 @@
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
|
||||
import openstack_dashboard.dashboards.project. \
|
||||
import openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.data_image_registry.views as views
|
||||
|
||||
|
||||
@ -22,12 +22,12 @@ from horizon import forms
|
||||
from horizon import tables
|
||||
from horizon.utils import memoized
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.dashboards.project. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.data_image_registry.forms import EditTagsForm
|
||||
from openstack_dashboard.dashboards.project. \
|
||||
from openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.data_image_registry.forms import RegisterImageForm
|
||||
from openstack_dashboard.dashboards.project. \
|
||||
from openstack_dashboard.contrib.sahara.content. \
|
||||
data_processing.data_image_registry.tables import ImageRegistryTable
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import exceptions
|
||||
from horizon import tabs
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -15,7 +15,7 @@ from django import http
|
||||
|
||||
from mox3.mox import IsA # noqa
|
||||
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard.contrib.sahara import api
|
||||
from openstack_dashboard.test import helpers as test
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
|
||||
from openstack_dashboard.dashboards.project.\
|
||||
from openstack_dashboard.contrib.sahara.content.\
|
||||
data_processing.data_plugins import views
|
||||
|
||||
|
||||
@ -19,10 +19,10 @@ from horizon import exceptions
|
||||
from horizon import tables
|
||||
from horizon import tabs
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
data_plugins.tables as p_tables
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
data_plugins.tabs as p_tabs
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -18,7 +18,7 @@ from django.utils.translation import ungettext_lazy
|
||||
|
||||
from horizon import tables
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import tabs
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -15,7 +15,7 @@ from django import http
|
||||
|
||||
from mox3.mox import IsA # noqa
|
||||
|
||||
from openstack_dashboard import api
|
||||
from openstack_dashboard.contrib.sahara import api
|
||||
from openstack_dashboard.test import helpers as test
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
from django.conf.urls import patterns
|
||||
from django.conf.urls import url
|
||||
|
||||
import openstack_dashboard.dashboards.project.data_processing. \
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
data_sources.views as views
|
||||
|
||||
|
||||
@ -22,14 +22,14 @@ from horizon.utils import memoized
|
||||
from horizon.utils.urlresolvers import reverse # noqa
|
||||
from horizon import workflows
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
import openstack_dashboard.dashboards.project.data_processing.data_sources. \
|
||||
tables as ds_tables
|
||||
import openstack_dashboard.dashboards.project.data_processing.data_sources. \
|
||||
tabs as _tabs
|
||||
import openstack_dashboard.dashboards.project.data_processing.data_sources. \
|
||||
workflows.create as create_flow
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
data_sources.tables as ds_tables
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
data_sources.tabs as _tabs
|
||||
import openstack_dashboard.contrib.sahara.content.data_processing. \
|
||||
data_sources.workflows.create as create_flow
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -19,8 +19,8 @@ from horizon import exceptions
|
||||
from horizon import forms
|
||||
from horizon import workflows
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.dashboards.project.data_processing \
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.content.data_processing \
|
||||
.utils import helpers
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
@ -26,7 +26,7 @@ from horizon import exceptions
|
||||
from horizon import forms
|
||||
from horizon import messages
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
@ -18,7 +18,7 @@ from django.utils.translation import ungettext_lazy
|
||||
|
||||
from horizon import tables
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
from saharaclient.api import base as api_base
|
||||
|
||||
@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from horizon import tabs
|
||||
|
||||
from openstack_dashboard.api import sahara as saharaclient
|
||||
from openstack_dashboard.contrib.sahara.api import sahara as saharaclient
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user