x/group-based-policy-ui
Code Issues Proposed changes

Updating test-requirements to point to kilo

Browse Source 
Change-Id: I4a61b27aa3c8b4cf930c3ffe9857b04b789e2e16
This commit is contained in:
Sumit Naiksatam 2015-04-28 20:02:23 -07:00
parent ca5cf99310
commit 26538e1c39
12 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gbpui/horizon/tests/base.py
View File

@ -18,4 +18,4 @@ import testtools
class TestCase(testtools.TestCase):
"""Test case base class for all unit tests."""
"""Test case base class for all unit tests."""

2
gbpui/horizon/tests/test_gbpui.py
View File

@ -25,4 +25,4 @@ from gbpui.horizon.tests import base
class TestGbpui(base.TestCase):
def test_something(self):
pass
pass

2
gbpui/openstack_dashboard/tests/base.py
View File

@ -18,4 +18,4 @@ import testtools
class TestCase(testtools.TestCase):
"""Test case base class for all unit tests."""
"""Test case base class for all unit tests."""

2
gbpui/openstack_dashboard/tests/test_gbpui.py
View File

@ -25,4 +25,4 @@ from gbpui.openstack_dashboard.tests import base
class TestGbpui(base.TestCase):
def test_something(self):
pass
pass

8
gbpui/panels/application_policy/tables.py
View File

@ -134,7 +134,7 @@ class ApplicationPoliciesTable(tables.DataTable):
sortable=False,
verbose_name=_("Policy Rules"))
class Meta:
class Meta(object):
name = "application_policies_table"
verbose_name = _("Policy Rule Set")
table_actions = (AddAppPolicyLink, DeleteAppPolicyLink)
@ -154,7 +154,7 @@ class PolicyRulesTable(tables.DataTable):
policy_actions = tables.Column("policy_actions",
verbose_name=_("Policy Actions"))
class Meta:
class Meta(object):
name = "policyrulestable"
verbose_name = _("Policy Rules")
table_actions = (AddPolicyRuleLink, DeletePolicyRuleLink)
@ -174,7 +174,7 @@ class PolicyClassifiersTable(tables.DataTable):
direction = tables.Column("direction",
verbose_name=_("Direction"))
class Meta:
class Meta(object):
name = "policyclassifierstable"
verbose_name = _("Policy Classifiers")
table_actions = (AddPolicyClassifierLink, DeletePolicyClassifierLink)
@ -192,7 +192,7 @@ class PolicyActionsTable(tables.DataTable):
action_value = tables.Column("action_value",
verbose_name=_("Value"))
class Meta:
class Meta(object):
name = "policyactionstable"
verbose_name = _("Policy Actions")
table_actions = (AddPolicyActionLink, DeletePolicyActionLink)

12
gbpui/panels/application_policy/workflows.py
View File

@ -33,7 +33,7 @@ class SelectPolicyRuleAction(workflows.Action):
add_item_link=ADD_POLICY_RULE_URL,
help_text=_("Create a policy rule set with selected rules."))
class Meta:
class Meta(object):
name = _("Rules")
help_text = _("Select policy rules for your policy rule set.")
@ -77,7 +77,7 @@ class AddContractAction(workflows.Action):
def __init__(self, request, *args, **kwargs):
super(AddContractAction, self).__init__(request, *args, **kwargs)
class Meta:
class Meta(object):
name = _("Create Policy Rule Set")
help_text = _("Create a new Policy Rule Set")
@ -128,7 +128,7 @@ class SelectPolicyClassifierAction(workflows.Action):
help_text=_("Create a policy with selected classifier."),
add_item_link=ADD_POLICY_CLASSIFIER_URL)
class Meta:
class Meta(object):
name = _("Classifiers")
help_text = _("Select classifiers for your policy-rule.")
@ -155,7 +155,7 @@ class SelectPolicyActionAction(workflows.Action):
help_text=_("Create a policy-rule with selected action."),
add_item_link=ADD_POLICY_ACTION_URL)
class Meta:
class Meta(object):
name = _("actions")
help_text = _("Select actions for your policy-rule.")
@ -214,7 +214,7 @@ class AddPolicyRuleAction(workflows.Action):
def __init__(self, request, *args, **kwargs):
super(AddPolicyRuleAction, self).__init__(request, *args, **kwargs)
class Meta:
class Meta(object):
name = _("Create Policy-Rule")
help_text = _("Create a new Policy-Rule")
@ -277,7 +277,7 @@ class AddClassifierAction(workflows.Action):
def __init__(self, request, *args, **kwargs):
super(AddClassifierAction, self).__init__(request, *args, **kwargs)
class Meta:
class Meta(object):
name = _("Create Classifier")
help_text = _("Create a new Classifier")

6
gbpui/panels/network_policy/tables.py
View File

@ -51,7 +51,7 @@ class L2PolicyTable(tables.DataTable):
l3_policy_id = tables.Column(
"l3_policy_id", verbose_name=_("L3 Policy ID"))
class Meta:
class Meta(object):
name = "l2policy_table"
verbose_name = _("L2 Policies")
table_actions = (CreateL2PolicyLink, DeleteL2PolicyLink)
@ -95,7 +95,7 @@ class L3PolicyTable(tables.DataTable):
subnet_prefix_length = tables.Column(
"subnet_prefix_length", verbose_name=_("Subnet Prefix Length"))
class Meta:
class Meta(object):
name = "l3policy_table"
verbose_name = _("L3 Policy")
table_actions = (CreateL3PolicyLink, DeleteL3PolicyLink,)
@ -135,7 +135,7 @@ class ServicePolicyTable(tables.DataTable):
network_service_params = tables.Column('network_service_params',
verbose_name=_("Network Service Params"))
class Meta:
class Meta(object):
name = "service_policy_table"
verbose_name = _("Service Policies")
table_actions = (CreateServicePolicyLink, DeleteServicePolicyLink,)

6
gbpui/panels/network_services/tables.py
View File

@ -50,7 +50,7 @@ class ServiceChainSpecTable(tables.DataTable):
verbose_name=_("Description"))
nodes = tables.Column("nodes", verbose_name=_("Nodes"))
class Meta:
class Meta(object):
name = "service_chain_spec_table"
verbose_name = _("Service Chain Specs")
table_actions = (CreateServiceChainSpecLink,
@ -94,7 +94,7 @@ class ServiceChainNodeTable(tables.DataTable):
service_type = tables.Column("service_type",
verbose_name=_("Service Type"))
class Meta:
class Meta(object):
name = "service_chain_node_table"
verbose_name = _("Service Chain Node")
table_actions = (CreateServiceChainNodeLink,
@ -143,7 +143,7 @@ class ServiceChainInstanceTable(tables.DataTable):
"servicechain_spec", verbose_name=_("Service Chain Spec"))
classifier = tables.Column("classifier", verbose_name=_("Classifier"))
class Meta:
class Meta(object):
name = "service_chain_instance_table"
verbose_name = _("Service Chain Instance")
table_actions = (CreateServiceChainInstanceLink,)

8
gbpui/panels/policytargets/tables.py
View File

@ -66,7 +66,7 @@ class PTGsTable(tables.DataTable):
l2_policy_id = tables.Column("l2_policy_id",
verbose_name=_("L2 Policy"))
class Meta:
class Meta(object):
name = "policy_targetstable"
verbose_name = _("Groups")
table_actions = (AddPTGLink, DeletePTGLink)
@ -142,7 +142,7 @@ class InstancesTable(tables.DataTable):
def get_empty_message(self, *args, **kwargs):
return "No members in this group, create one"
class Meta:
class Meta(object):
name = "instances"
verbose_name = _("Members")
table_actions = (LaunchVMLink,)
@ -180,7 +180,7 @@ class ProvidedContractsTable(tables.DataTable):
sortable=False,
verbose_name=_("Policy Rules"))
class Meta:
class Meta(object):
name = 'provided_policy_rule_sets'
verbose_name = _("Provided Policy Rule Set")
table_actions = (AddProvidedLink, RemoveProvidedLink,)
@ -218,7 +218,7 @@ class ConsumedContractsTable(tables.DataTable):
sortable=False,
verbose_name=_("Policy Rules"))
class Meta:
class Meta(object):
name = 'consumed_policy_rule_sets'
verbose_name = _("Consumed Policy Rule Set")
table_actions = (AddConsumedLink, RemoveConsumedLink,)

6
gbpui/panels/policytargets/workflows.py
View File

@ -45,7 +45,7 @@ class SelectPolicyRuleSetAction(workflows.Action):
add_item_link=POLICY_RULE_SET_URL,
required=False)
class Meta:
class Meta(object):
name = _("Application Policy")
help_text = _("Select Policy Rule Set for Group.")
@ -91,7 +91,7 @@ class SelectL2policyAction(workflows.Action):
help_text=_("Select network services policy for Group."),
required=False)
class Meta:
class Meta(object):
name = _("Network Policy")
help_text = _(
"Select network policy for Group."
@ -176,7 +176,7 @@ class AddPTGAction(workflows.Action):
def __init__(self, request, *args, **kwargs):
super(AddPTGAction, self).__init__(request, *args, **kwargs)
class Meta:
class Meta(object):
name = _("Create Group")
help_text = _("Create a new Group")

3
requirements.txt
View File

@ -1,6 +1,3 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0
Babel>=1.3

12
test-requirements.txt
View File

@ -8,12 +8,12 @@
#
# Hacking should appear first in case something else depends on pep8
-e git://github.com/openstack/horizon.git@stable/juno#egg=horizon
hacking>=0.9.2,<0.10
-e git://github.com/openstack/horizon.git@stable/kilo#egg=horizon
hacking>=0.10.0,<0.11
#
coverage>=3.6
django-nose
python-neutronclient==2.3.9
mock>=1.0
mox>=0.5.3
nodeenv>=0.9.4 # BSD License
nose
@ -21,9 +21,9 @@ nose-exclude
nosehtmloutput>=0.0.3
nosexcover
openstack.nose_plugin>=0.7
oslosphinx>=2.2.0 # Apache-2.0
oslosphinx>=2.5.0 # Apache-2.0
selenium
sphinx>=1.1.2,!=1.2.0,<1.3
testtools>=0.9.34
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
testtools>=0.9.36,!=1.2.0
# This also needs xvfb library installed on your OS
xvfbwrapper>=0.1.3 #license: MIT