Fixed pep8. Fixed deployment script.
This commit is contained in:
@@ -35,27 +35,35 @@ def windcclient(request):
|
|||||||
% (request.user.token, url))
|
% (request.user.token, url))
|
||||||
return windc_client.Client(endpoint=url, token=None)
|
return windc_client.Client(endpoint=url, token=None)
|
||||||
|
|
||||||
|
|
||||||
def datacenters_create(request, parameters):
|
def datacenters_create(request, parameters):
|
||||||
name = parameters.get('name', '')
|
name = parameters.get('name', '')
|
||||||
return windcclient(request).datacenters.create(name)
|
return windcclient(request).datacenters.create(name)
|
||||||
|
|
||||||
|
|
||||||
def datacenters_delete(request, datacenter_id):
|
def datacenters_delete(request, datacenter_id):
|
||||||
return windcclient(request).datacenters.delete(datacenter_id)
|
return windcclient(request).datacenters.delete(datacenter_id)
|
||||||
|
|
||||||
|
|
||||||
def datacenters_get(request, datacenter_id):
|
def datacenters_get(request, datacenter_id):
|
||||||
return windcclient(request).datacenters.get(datacenter_id)
|
return windcclient(request).datacenters.get(datacenter_id)
|
||||||
|
|
||||||
|
|
||||||
def datacenters_list(request):
|
def datacenters_list(request):
|
||||||
return windcclient(request).datacenters.list()
|
return windcclient(request).datacenters.list()
|
||||||
|
|
||||||
|
|
||||||
def services_create(request, datacenter, parameters):
|
def services_create(request, datacenter, parameters):
|
||||||
return windcclient(request).services.create(datacenter, parameters)
|
return windcclient(request).services.create(datacenter, parameters)
|
||||||
|
|
||||||
|
|
||||||
def services_list(request, datacenter):
|
def services_list(request, datacenter):
|
||||||
return windcclient(request).services.list(datacenter)
|
return windcclient(request).services.list(datacenter)
|
||||||
|
|
||||||
|
|
||||||
def services_get(request, datacenter, service_id):
|
def services_get(request, datacenter, service_id):
|
||||||
return windcclient(request).services.get(datacenter, service_id)
|
return windcclient(request).services.get(datacenter, service_id)
|
||||||
|
|
||||||
|
|
||||||
def services_delete(request, datacenter, service_id):
|
def services_delete(request, datacenter, service_id):
|
||||||
return windcclient(request).services.delete(datacenter, service_id)
|
return windcclient(request).services.delete(datacenter, service_id)
|
||||||
|
@@ -20,7 +20,8 @@
|
|||||||
|
|
||||||
from django.conf.urls.defaults import patterns, url
|
from django.conf.urls.defaults import patterns, url
|
||||||
|
|
||||||
from .views import IndexView, CreateWinDCView, WinServices, CreateWinServiceView
|
from .views import IndexView, WinServices, \
|
||||||
|
CreateWinDCView, CreateWinServiceView
|
||||||
from .views import Wizard
|
from .views import Wizard
|
||||||
from .forms import WizardFormServiceType, WizardFormConfiguration
|
from .forms import WizardFormServiceType, WizardFormConfiguration
|
||||||
|
|
||||||
|
@@ -15,7 +15,8 @@
|
|||||||
# Unless required by applicable law or agreed to in writing, software
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
# License for the specific language governing permissions and limitations# under the License.
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Views for managing instances.
|
Views for managing instances.
|
||||||
@@ -59,6 +60,7 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
|
|||||||
print data
|
print data
|
||||||
return form
|
return form
|
||||||
|
|
||||||
|
|
||||||
class IndexView(tables.DataTableView):
|
class IndexView(tables.DataTableView):
|
||||||
table_class = WinDCTable
|
table_class = WinDCTable
|
||||||
template_name = 'project/windc/index.html'
|
template_name = 'project/windc/index.html'
|
||||||
@@ -108,6 +110,7 @@ class CreateWinDCView(workflows.WorkflowView):
|
|||||||
initial['user_id'] = self.request.user.id
|
initial['user_id'] = self.request.user.id
|
||||||
return initial
|
return initial
|
||||||
|
|
||||||
|
|
||||||
class CreateWinServiceView(workflows.WorkflowView):
|
class CreateWinServiceView(workflows.WorkflowView):
|
||||||
workflow_class = CreateWinService
|
workflow_class = CreateWinService
|
||||||
template_name = "project/windc/create.html"
|
template_name = "project/windc/create.html"
|
||||||
|
@@ -84,10 +84,6 @@ class ConfigureWinDCAction(workflows.Action):
|
|||||||
dc_name = forms.CharField(label=_("Domain Name"),
|
dc_name = forms.CharField(label=_("Domain Name"),
|
||||||
required=False)
|
required=False)
|
||||||
|
|
||||||
#dc_net_name = forms.CharField(label=_("Domain NetBIOS Name"),
|
|
||||||
# required=False,
|
|
||||||
# help_text=_("A NetBIOS name of new domain."))
|
|
||||||
|
|
||||||
dc_count = forms.IntegerField(label=_("Instances Count"),
|
dc_count = forms.IntegerField(label=_("Instances Count"),
|
||||||
required=True,
|
required=True,
|
||||||
min_value=1,
|
min_value=1,
|
||||||
@@ -192,7 +188,6 @@ class CreateWinService(workflows.Workflow):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class CreateWinDC(workflows.Workflow):
|
class CreateWinDC(workflows.Workflow):
|
||||||
slug = "create"
|
slug = "create"
|
||||||
name = _("Create Windows Data Center")
|
name = _("Create Windows Data Center")
|
||||||
|
@@ -70,14 +70,13 @@ expect "*#*"
|
|||||||
send -- "rabbitmqctl set_user_tags keero administrator\n"
|
send -- "rabbitmqctl set_user_tags keero administrator\n"
|
||||||
expect "*#*"
|
expect "*#*"
|
||||||
|
|
||||||
|
send -- "su - stack\n"
|
||||||
|
expect "*$*"
|
||||||
send -- "cd /opt/stack/devstack\n"
|
send -- "cd /opt/stack/devstack\n"
|
||||||
expect "*#*"
|
expect "*$*"
|
||||||
send -- "source openrc admin admin\n"
|
send -- "source openrc admin admin\n"
|
||||||
expect "*#*"
|
expect "*$*"
|
||||||
send -- "cd /opt/stack/keero/windc\n"
|
send -- "cd /opt/stack/keero/windc\n"
|
||||||
expect "*#*"
|
expect "*$*"
|
||||||
send -- "./tools/with_venv.sh ./bin/windc-api --config-file=./etc/windc-api-paste.ini &\n"
|
send -- "sudo ./tools/with_venv.sh ./bin/windc-api --config-file=./etc/windc-api-paste.ini > /opt/stack/tests_windc_daemon.log &\n"
|
||||||
expect "*DEBUG Call factory*"
|
expect "*$*"
|
||||||
send -- "\n"
|
|
||||||
expect "*#*"
|
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import re
|
import re
|
||||||
from login_page import LoginPage
|
from login_page import LoginPage
|
||||||
|
|
||||||
|
|
||||||
class DataCentersPage():
|
class DataCentersPage():
|
||||||
page = None
|
page = None
|
||||||
|
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import ConfigParser
|
import ConfigParser
|
||||||
from selenium import webdriver
|
from selenium import webdriver
|
||||||
|
|
||||||
|
|
||||||
class LoginPage():
|
class LoginPage():
|
||||||
|
|
||||||
def login(self):
|
def login(self):
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import ConfigParser
|
import ConfigParser
|
||||||
from selenium import webdriver
|
from selenium import webdriver
|
||||||
|
|
||||||
|
|
||||||
class ServicesPage():
|
class ServicesPage():
|
||||||
page = None
|
page = None
|
||||||
|
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import untitests
|
import untitests
|
||||||
from datacenters_page import DataCentersPage
|
from datacenters_page import DataCentersPage
|
||||||
|
|
||||||
|
|
||||||
class SanityTests():
|
class SanityTests():
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
Reference in New Issue
Block a user