From ca5cf99310ec652be13b6cd9d84b46c10f921d46 Mon Sep 17 00:00:00 2001 From: Sumit Naiksatam Date: Thu, 19 Feb 2015 12:50:45 -0800 Subject: [PATCH] Removing tenant filtering after fetching resources This allows shared resources to be displayed and accessed in other tenants. Closes-bug: 1431615 Change-Id: I56e59ca52d605c52c60292d2ea87371d9a33134d --- gbpui/panels/application_policy/forms.py | 9 +++------ gbpui/panels/application_policy/tabs.py | 18 ++++-------------- gbpui/panels/application_policy/workflows.py | 12 +++--------- gbpui/panels/network_policy/tabs.py | 6 ++---- gbpui/panels/network_policy/views.py | 3 +-- gbpui/panels/policytargets/forms.py | 19 ++++++------------- gbpui/panels/policytargets/tabs.py | 4 +--- gbpui/panels/policytargets/workflows.py | 14 +++++--------- 8 files changed, 25 insertions(+), 60 deletions(-) diff --git a/gbpui/panels/application_policy/forms.py b/gbpui/panels/application_policy/forms.py index f283d40..fde3569 100644 --- a/gbpui/panels/application_policy/forms.py +++ b/gbpui/panels/application_policy/forms.py @@ -109,8 +109,7 @@ class AddPolicyActionForm(forms.SelfHandlingForm): super(AddPolicyActionForm, self).__init__(request, *args, **kwargs) url = reverse('horizon:project:application_policy:index') try: - sc_specs = client.servicechainspec_list(request, - tenant_id=request.user.tenant_id) + sc_specs = client.servicechainspec_list(request) self.fields['action_value'].choices = \ [(spec.id, (spec.name if spec.name is not None else "") + ":" + spec.id) @@ -248,21 +247,19 @@ class UpdatePolicyRuleForm(forms.SelfHandlingForm): def __init__(self, request, *args, **kwargs): super(UpdatePolicyRuleForm, self).__init__(request, *args, **kwargs) try: - tenant_id = request.user.tenant_id policyrule_id = self.initial['policyrule_id'] rule = client.policyrule_get(request, policyrule_id) for item in ['name', 'description', 'policy_classifier_id', 'policy_actions']: self.fields[item].initial = getattr(rule, item) - actions = client.policyaction_list(request, tenant_id=tenant_id) + actions = client.policyaction_list(request) action_list = [a.id for a in actions] for action in actions: action.set_id_as_name_if_empty() actions = sorted(actions, key=lambda action: action.name) action_list = [(a.id, a.name) for a in actions] self.fields['policy_actions'].choices = action_list - classifiers = client.policyclassifier_list( - request, tenant_id=tenant_id) + classifiers = client.policyclassifier_list(request) classifier_list = [(c.id, c.name) for c in classifiers] self.fields['policy_classifier_id'].choices = classifier_list except Exception: diff --git a/gbpui/panels/application_policy/tabs.py b/gbpui/panels/application_policy/tabs.py index 7fad372..37b1356 100644 --- a/gbpui/panels/application_policy/tabs.py +++ b/gbpui/panels/application_policy/tabs.py @@ -35,10 +35,7 @@ class PolicyActionsTab(tabs.TableTab): def get_policyactionstable_data(self): actions = [] try: - tenant_id = self.request.user.tenant_id - actions = client.policyaction_list( - self.tab_group.request, - tenant_id=tenant_id) + actions = client.policyaction_list(self.tab_group.request) a = lambda x, y: gfilters.update_policyaction_attributes(x, y) actions = [a(self.request, item) for item in actions] except Exception as e: @@ -55,10 +52,7 @@ class PolicyClassifiersTab(tabs.TableTab): def get_policyclassifierstable_data(self): try: - tenant_id = self.request.user.tenant_id - classifiers = client.policyclassifier_list( - self.tab_group.request, - tenant_id=tenant_id) + classifiers = client.policyclassifier_list(self.tab_group.request) except Exception: classifiers = [] exceptions.handle(self.tab_group.request, @@ -78,10 +72,7 @@ class PolicyRulesTab(tabs.TableTab): def get_policyrulestable_data(self): try: - tenant_id = self.request.user.tenant_id - policy_rules = client.policyrule_list( - self.tab_group.request, - tenant_id=tenant_id) + policy_rules = client.policyrule_list(self.tab_group.request) policy_rules = [gfilters.update_policyrule_attributes( self.request, item) for item in policy_rules] except Exception: @@ -104,9 +95,8 @@ class ApplicationPoliciesTab(tabs.TableTab): def get_application_policies_table_data(self): policy_rule_sets = [] try: - tenant_id = self.request.user.tenant_id policy_rule_sets = client.policy_rule_set_list( - self.tab_group.request, tenant_id=tenant_id) + self.tab_group.request) policy_rule_sets = [gfilters.update_pruleset_attributes( self.request, item) for item in policy_rule_sets] except Exception: diff --git a/gbpui/panels/application_policy/workflows.py b/gbpui/panels/application_policy/workflows.py index 365637a..d3b7e78 100644 --- a/gbpui/panels/application_policy/workflows.py +++ b/gbpui/panels/application_policy/workflows.py @@ -39,9 +39,7 @@ class SelectPolicyRuleAction(workflows.Action): def populate_policy_rules_choices(self, request, context): try: - tenant_id = self.request.user.tenant_id - rules = client.policyrule_list(request, - tenant_id=tenant_id) + rules = client.policyrule_list(request) for r in rules: r.set_id_as_name_if_empty() rules = sorted(rules, @@ -136,9 +134,7 @@ class SelectPolicyClassifierAction(workflows.Action): def populate_classifier_choices(self, request, context): try: - tenant_id = self.request.user.tenant_id - classifiers = client.policyclassifier_list(request, - tenant_id=tenant_id) + classifiers = client.policyclassifier_list(request) for classifier in classifiers: classifier.set_id_as_name_if_empty() classifiers = sorted(classifiers, @@ -165,9 +161,7 @@ class SelectPolicyActionAction(workflows.Action): def populate_actions_choices(self, request, context): try: - tenant_id = self.request.user.tenant_id - actions = client.policyaction_list(request, - tenant_id=tenant_id) + actions = client.policyaction_list(request) action_list = [a.id for a in actions] for action in actions: action.set_id_as_name_if_empty() diff --git a/gbpui/panels/network_policy/tabs.py b/gbpui/panels/network_policy/tabs.py index 1d3e5c6..97dcb5a 100644 --- a/gbpui/panels/network_policy/tabs.py +++ b/gbpui/panels/network_policy/tabs.py @@ -48,8 +48,7 @@ class L3PolicyTab(tabs.TableTab): def get_l3policy_table_data(self): policies = [] try: - tenant_id = self.request.user.tenant_id - policies = client.l3policy_list(self.request, tenant_id=tenant_id) + policies = client.l3policy_list(self.request) except Exception: policies = [] exceptions.handle(self.tab_group.request, @@ -66,8 +65,7 @@ class L2PolicyTab(tabs.TableTab): def get_l2policy_table_data(self): policies = [] try: - tenant_id = self.request.user.tenant_id - policies = client.l2policy_list(self.request, tenant_id=tenant_id) + policies = client.l2policy_list(self.request) except Exception: policies = [] exceptions.handle(self.tab_group.request, diff --git a/gbpui/panels/network_policy/views.py b/gbpui/panels/network_policy/views.py index 2ef5bb4..5b03c11 100644 --- a/gbpui/panels/network_policy/views.py +++ b/gbpui/panels/network_policy/views.py @@ -99,8 +99,7 @@ class L3PolicyDetailsView(tables.MultiTableView): def get_l2policy_table_data(self): policies = [] try: - tenant_id = self.request.user.tenant_id - policies = client.l2policy_list(self.request, tenant_id=tenant_id) + policies = client.l2policy_list(self.request) except Exception: policies = [] exceptions.handle(self.tab_group.request, diff --git a/gbpui/panels/policytargets/forms.py b/gbpui/panels/policytargets/forms.py index bb92a6b..e49b0a1 100644 --- a/gbpui/panels/policytargets/forms.py +++ b/gbpui/panels/policytargets/forms.py @@ -49,9 +49,7 @@ class UpdatePolicyTargetForm(forms.SelfHandlingForm): try: policy_target_id = self.initial['policy_target_id'] policy_target = client.policy_target_get(request, policy_target_id) - tenant_id = self.request.user.tenant_id - policy_rule_sets = client.policy_rule_set_list( - request, tenant_id=tenant_id) + policy_rule_sets = client.policy_rule_set_list(request) for c in policy_rule_sets: c.set_id_as_name_if_empty() policy_rule_sets = sorted( @@ -71,8 +69,7 @@ class UpdatePolicyTargetForm(forms.SelfHandlingForm): self.fields['provided_policy_rule_sets'].initial = provided_init self.fields['consumed_policy_rule_sets'].initial = consumed_init n_policies = client.l2policy_list(request) - ns_policies = client.networkservicepolicy_list( - request, tenant_id=request.user.tenant_id) + ns_policies = client.networkservicepolicy_list(request) n_policies = [(item.id, item.name) for item in n_policies] ns_policies = [(item.id, item.name) for item in ns_policies] ns_policies.insert(0, ('None', 'None')) @@ -121,12 +118,11 @@ class AddProvidedPRSForm(forms.SelfHandlingForm): super(AddProvidedPRSForm, self).__init__(request, *args, **kwargs) policy_rule_sets = [] try: - tenant_id = self.request.user.tenant_id policy_target_id = kwargs['initial']['policy_target_id'] policy_target = client.policy_target_get(request, policy_target_id) providedpolicy_rule_sets = policy_target.get( "provided_policy_rule_sets") - items = client.policy_rule_set_list(request, tenant_id=tenant_id) + items = client.policy_rule_set_list(request) policy_rule_sets = [ (p.id, p.name) for p in items if p.id not in providedpolicy_rule_sets] @@ -170,12 +166,11 @@ class RemoveProvidedPRSForm(forms.SelfHandlingForm): super(RemoveProvidedPRSForm, self).__init__(request, *args, **kwargs) policy_rule_sets = [] try: - tenant_id = self.request.user.tenant_id policy_target_id = kwargs['initial']['policy_target_id'] policy_target = client.policy_target_get(request, policy_target_id) providedpolicy_rule_sets = policy_target.get( "provided_policy_rule_sets") - items = client.policy_rule_set_list(request, tenant_id=tenant_id) + items = client.policy_rule_set_list(request) policy_rule_sets = [(p.id, p.name) for p in items if p.id in providedpolicy_rule_sets] @@ -220,12 +215,11 @@ class AddConsumedPRSForm(forms.SelfHandlingForm): super(AddConsumedPRSForm, self).__init__(request, *args, **kwargs) policy_rule_sets = [] try: - tenant_id = self.request.user.tenant_id policy_target_id = kwargs['initial']['policy_target_id'] policy_target = client.policy_target_get(request, policy_target_id) consumedpolicy_rule_sets = policy_target.get( "consumed_policy_rule_sets") - items = client.policy_rule_set_list(request, tenant_id=tenant_id) + items = client.policy_rule_set_list(request) policy_rule_sets = [ (p.id, p.name) for p in items if p.id not in consumedpolicy_rule_sets] @@ -267,12 +261,11 @@ class RemoveConsumedPRSForm(forms.SelfHandlingForm): super(RemoveConsumedPRSForm, self).__init__(request, *args, **kwargs) policy_rule_sets = [] try: - tenant_id = self.request.user.tenant_id policy_target_id = kwargs['initial']['policy_target_id'] policy_target = client.policy_target_get(request, policy_target_id) consumedpolicy_rule_sets = policy_target.get( "consumed_policy_rule_sets") - items = client.policy_rule_set_list(request, tenant_id=tenant_id) + items = client.policy_rule_set_list(request) policy_rule_sets = [(p.id, p.name) for p in items if p.id in consumedpolicy_rule_sets] diff --git a/gbpui/panels/policytargets/tabs.py b/gbpui/panels/policytargets/tabs.py index dfbe151..7dfb37f 100644 --- a/gbpui/panels/policytargets/tabs.py +++ b/gbpui/panels/policytargets/tabs.py @@ -36,9 +36,7 @@ class PTGsTab(tabs.TableTab): def get_policy_targetstable_data(self): policy_targets = [] try: - tenant_id = self.request.user.tenant_id - policy_targets = client.policy_target_list(self.tab_group.request, - tenant_id=tenant_id) + policy_targets = client.policy_target_list(self.tab_group.request) a = lambda x, y: gfilters.update_policy_target_attributes(x, y) policy_targets = [a(self.request, item) for item in policy_targets] except Exception as e: diff --git a/gbpui/panels/policytargets/workflows.py b/gbpui/panels/policytargets/workflows.py index fcf0c55..d852d4e 100644 --- a/gbpui/panels/policytargets/workflows.py +++ b/gbpui/panels/policytargets/workflows.py @@ -49,9 +49,8 @@ class SelectPolicyRuleSetAction(workflows.Action): name = _("Application Policy") help_text = _("Select Policy Rule Set for Group.") - def _policy_rule_set_list(self, request, tenant_id): - policy_rule_sets = client.policy_rule_set_list(request, - tenant_id=tenant_id) + def _policy_rule_set_list(self, request): + policy_rule_sets = client.policy_rule_set_list(request) for c in policy_rule_sets: c.set_id_as_name_if_empty() policy_rule_sets = sorted(policy_rule_sets, @@ -61,8 +60,7 @@ class SelectPolicyRuleSetAction(workflows.Action): def populate_provided_policy_rule_set_choices(self, request, context): policy_rule_set_list = [] try: - tenant_id = self.request.user.tenant_id - rsets = self._policy_rule_set_list(request, tenant_id) + rsets = self._policy_rule_set_list(request) if len(rsets) == 0: rsets.extend([('None', 'No Provided Policy Rule Sets')]) policy_rule_set_list = rsets @@ -75,10 +73,9 @@ class SelectPolicyRuleSetAction(workflows.Action): def populate_consumed_policy_rule_set_choices(self, request, context): policy_rule_set_list = [] try: - tenant_id = self.request.user.tenant_id policy_rule_set_list = [('None', 'No Consumed Policy Rule Sets')] policy_rule_set_list =\ - self._policy_rule_set_list(request, tenant_id) + self._policy_rule_set_list(request) except Exception as e: msg = _('Unable to retrieve policy rule set. %s.') % (str(e)) exceptions.handle(request, msg) @@ -118,8 +115,7 @@ class SelectL2policyAction(workflows.Action): def populate_network_service_policy_id_choices(self, request, context): policies = [] try: - policies = client.networkservicepolicy_list( - request, tenant_id=request.user.tenant_id) + policies = client.networkservicepolicy_list(request) for p in policies: p.set_id_as_name_if_empty() policies = [(p.id, p.name + ":" + p.id) for p in policies]