openstack
/
horizon
Code Issues Proposed changes

Make Neutron API name consistent 

Previously several types of name are used for same type operations
in Neutron releated API method names.

* XXXX_modify -> XXXX_update
* <plural>_get -> <singular>_list
* <plural>_list -> <singular>_list

Closes-Bug: #1261283
Change-Id: I95c268822d1a55ea0440b44ea2c7993979ee4c36
This commit is contained in:
Akihiro MOTOKI 2013-11-21 04:48:13 +09:00 committed by Akihiro Motoki
parent d8b8284c7b
commit 821ce1c3f4
28 changed files with 255 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openstack_dashboard/api/fwaas.py
View File

@ -72,15 +72,15 @@ def rule_create(request, **kwargs):
return Rule(rule) return Rule(rule)
def rules_list(request, **kwargs): def rule_list(request, **kwargs):
return _rules_list(request, expand_policy=True, **kwargs) return _rule_list(request, expand_policy=True, **kwargs)
def _rules_list(request, expand_policy, **kwargs): def _rule_list(request, expand_policy, **kwargs):
rules = neutronclient(request).list_firewall_rules( rules = neutronclient(request).list_firewall_rules(
**kwargs).get('firewall_rules') **kwargs).get('firewall_rules')
if expand_policy: if expand_policy:
policies = _policies_list(request, expand_rule=False) policies = _policy_list(request, expand_rule=False)
policy_dict = SortedDict((p.id, p) for p in policies) policy_dict = SortedDict((p.id, p) for p in policies)
for rule in rules: for rule in rules:
rule['policy'] = policy_dict.get(rule['firewall_policy_id']) rule['policy'] = policy_dict.get(rule['firewall_policy_id'])
@ -131,15 +131,15 @@ def policy_create(request, **kwargs):
return Policy(policy) return Policy(policy)
def policies_list(request, **kwargs): def policy_list(request, **kwargs):
return _policies_list(request, expand_rule=True, **kwargs) return _policy_list(request, expand_rule=True, **kwargs)
def _policies_list(request, expand_rule, **kwargs): def _policy_list(request, expand_rule, **kwargs):
policies = neutronclient(request).list_firewall_policies( policies = neutronclient(request).list_firewall_policies(
**kwargs).get('firewall_policies') **kwargs).get('firewall_policies')
if expand_rule: if expand_rule:
rules = _rules_list(request, expand_policy=False) rules = _rule_list(request, expand_policy=False)
rule_dict = SortedDict((rule.id, rule) for rule in rules) rule_dict = SortedDict((rule.id, rule) for rule in rules)
for p in policies: for p in policies:
p['rules'] = [rule_dict.get(rule) for rule in p['firewall_rules']] p['rules'] = [rule_dict.get(rule) for rule in p['firewall_rules']]
@ -156,8 +156,8 @@ def _policy_get(request, policy_id, expand_rule):
if expand_rule: if expand_rule:
policy_rules = policy['firewall_rules'] policy_rules = policy['firewall_rules']
if policy_rules: if policy_rules:
rules = _rules_list(request, expand_policy=False, rules = _rule_list(request, expand_policy=False,
firewall_policy_id=policy_id) firewall_policy_id=policy_id)
rule_dict = SortedDict((rule.id, rule) for rule in rules) rule_dict = SortedDict((rule.id, rule) for rule in rules)
policy['rules'] = [rule_dict.get(rule) for rule in policy_rules] policy['rules'] = [rule_dict.get(rule) for rule in policy_rules]
else: else:
@ -204,15 +204,15 @@ def firewall_create(request, **kwargs):
return Firewall(firewall) return Firewall(firewall)
def firewalls_list(request, **kwargs): def firewall_list(request, **kwargs):
return _firewalls_list(request, expand_policy=True, **kwargs) return _firewall_list(request, expand_policy=True, **kwargs)
def _firewalls_list(request, expand_policy, **kwargs): def _firewall_list(request, expand_policy, **kwargs):
firewalls = neutronclient(request).list_firewalls( firewalls = neutronclient(request).list_firewalls(
**kwargs).get('firewalls') **kwargs).get('firewalls')
if expand_policy: if expand_policy:
policies = _policies_list(request, expand_rule=False) policies = _policy_list(request, expand_rule=False)
policy_dict = SortedDict((p.id, p) for p in policies) policy_dict = SortedDict((p.id, p) for p in policies)
for fw in firewalls: for fw in firewalls:
fw['policy'] = policy_dict.get(fw['firewall_policy_id']) fw['policy'] = policy_dict.get(fw['firewall_policy_id'])

8
openstack_dashboard/api/lbaas.py
View File

@ -147,7 +147,7 @@ def vip_create(request, **kwargs):
return Vip(vip) return Vip(vip)
def vips_get(request, **kwargs): def vip_list(request, **kwargs):
vips = neutronclient(request).list_vips(**kwargs).get('vips') vips = neutronclient(request).list_vips(**kwargs).get('vips')
return [Vip(v) for v in vips] return [Vip(v) for v in vips]
@ -189,7 +189,7 @@ def pool_create(request, **kwargs):
return Pool(pool) return Pool(pool)
def pools_get(request, **kwargs): def pool_list(request, **kwargs):
pools = neutronclient(request).list_pools(**kwargs).get('pools') pools = neutronclient(request).list_pools(**kwargs).get('pools')
return [Pool(p) for p in pools] return [Pool(p) for p in pools]
@ -244,7 +244,7 @@ def pool_health_monitor_create(request, **kwargs):
return PoolMonitor(mon) return PoolMonitor(mon)
def pool_health_monitors_get(request, **kwargs): def pool_health_monitor_list(request, **kwargs):
monitors = neutronclient(request).list_health_monitors( monitors = neutronclient(request).list_health_monitors(
**kwargs).get('health_monitors') **kwargs).get('health_monitors')
return [PoolMonitor(m) for m in monitors] return [PoolMonitor(m) for m in monitors]
@ -287,7 +287,7 @@ def member_create(request, **kwargs):
return Member(member) return Member(member)
def members_get(request, **kwargs): def member_list(request, **kwargs):
members = neutronclient(request).list_members(**kwargs).get('members') members = neutronclient(request).list_members(**kwargs).get('members')
return [Member(m) for m in members] return [Member(m) for m in members]

18
openstack_dashboard/api/neutron.py
View File

@ -290,7 +290,7 @@ class SecurityGroupManager(network_base.SecurityGroupManager):
ports = port_list(self.request, device_id=instance_id) ports = port_list(self.request, device_id=instance_id)
for p in ports: for p in ports:
params = {'security_groups': new_security_group_ids} params = {'security_groups': new_security_group_ids}
port_modify(self.request, p.id, **params) port_update(self.request, p.id, **params)
class FloatingIp(base.APIDictWrapper): class FloatingIp(base.APIDictWrapper):
@ -491,8 +491,8 @@ def network_create(request, **kwargs):
return Network(network) return Network(network)
def network_modify(request, network_id, **kwargs): def network_update(request, network_id, **kwargs):
LOG.debug("network_modify(): netid=%s, params=%s" % (network_id, kwargs)) LOG.debug("network_update(): netid=%s, params=%s" % (network_id, kwargs))
body = {'network': kwargs} body = {'network': kwargs}
network = neutronclient(request).update_network(network_id, network = neutronclient(request).update_network(network_id,
body=body).get('network') body=body).get('network')
@ -539,8 +539,8 @@ def subnet_create(request, network_id, cidr, ip_version, **kwargs):
return Subnet(subnet) return Subnet(subnet)
def subnet_modify(request, subnet_id, **kwargs): def subnet_update(request, subnet_id, **kwargs):
LOG.debug("subnet_modify(): subnetid=%s, kwargs=%s" % (subnet_id, kwargs)) LOG.debug("subnet_update(): subnetid=%s, kwargs=%s" % (subnet_id, kwargs))
body = {'subnet': kwargs} body = {'subnet': kwargs}
subnet = neutronclient(request).update_subnet(subnet_id, subnet = neutronclient(request).update_subnet(subnet_id,
body=body).get('subnet') body=body).get('subnet')
@ -588,8 +588,8 @@ def port_delete(request, port_id):
neutronclient(request).delete_port(port_id) neutronclient(request).delete_port(port_id)
def port_modify(request, port_id, **kwargs): def port_update(request, port_id, **kwargs):
LOG.debug("port_modify(): portid=%s, kwargs=%s" % (port_id, kwargs)) LOG.debug("port_update(): portid=%s, kwargs=%s" % (port_id, kwargs))
body = {'port': kwargs} body = {'port': kwargs}
port = neutronclient(request).update_port(port_id, body=body).get('port') port = neutronclient(request).update_port(port_id, body=body).get('port')
return Port(port) return Port(port)
@ -631,8 +631,8 @@ def profile_delete(request, profile_id):
neutronclient(request).delete_network_profile(profile_id) neutronclient(request).delete_network_profile(profile_id)
def profile_modify(request, profile_id, **kwargs): def profile_update(request, profile_id, **kwargs):
LOG.debug("profile_modify(): " LOG.debug("profile_update(): "
"profileid=%(profileid)s, kwargs=%(kwargs)s", "profileid=%(profileid)s, kwargs=%(kwargs)s",
{'profileid': profile_id, 'kwargs': kwargs}) {'profileid': profile_id, 'kwargs': kwargs})
body = {'network_profile': kwargs} body = {'network_profile': kwargs}

8
openstack_dashboard/api/vpn.py
View File

@ -148,7 +148,7 @@ def vpnservice_create(request, **kwargs):
return VPNService(vpnservice) return VPNService(vpnservice)
def vpnservices_get(request, **kwargs): def vpnservice_list(request, **kwargs):
vpnservices = neutronclient(request).list_vpnservices( vpnservices = neutronclient(request).list_vpnservices(
**kwargs).get('vpnservices') **kwargs).get('vpnservices')
return [VPNService(v) for v in vpnservices] return [VPNService(v) for v in vpnservices]
@ -198,7 +198,7 @@ def ikepolicy_create(request, **kwargs):
return IKEPolicy(ikepolicy) return IKEPolicy(ikepolicy)
def ikepolicies_get(request, **kwargs): def ikepolicy_list(request, **kwargs):
ikepolicies = neutronclient(request).list_ikepolicies( ikepolicies = neutronclient(request).list_ikepolicies(
**kwargs).get('ikepolicies') **kwargs).get('ikepolicies')
return [IKEPolicy(v) for v in ikepolicies] return [IKEPolicy(v) for v in ikepolicies]
@ -248,7 +248,7 @@ def ipsecpolicy_create(request, **kwargs):
return IPSecPolicy(ipsecpolicy) return IPSecPolicy(ipsecpolicy)
def ipsecpolicies_get(request, **kwargs): def ipsecpolicy_list(request, **kwargs):
ipsecpolicies = neutronclient(request).list_ipsecpolicies( ipsecpolicies = neutronclient(request).list_ipsecpolicies(
**kwargs).get('ipsecpolicies') **kwargs).get('ipsecpolicies')
return [IPSecPolicy(v) for v in ipsecpolicies] return [IPSecPolicy(v) for v in ipsecpolicies]
@ -308,7 +308,7 @@ def ipsecsiteconnection_create(request, **kwargs):
return IPSecSiteConnection(ipsecsiteconnection) return IPSecSiteConnection(ipsecsiteconnection)
def ipsecsiteconnections_get(request, **kwargs): def ipsecsiteconnection_list(request, **kwargs):
ipsecsiteconnections = neutronclient(request).list_ipsec_site_connections( ipsecsiteconnections = neutronclient(request).list_ipsec_site_connections(
**kwargs).get('ipsec_site_connections') **kwargs).get('ipsec_site_connections')
return [IPSecSiteConnection(v) for v in ipsecsiteconnections] return [IPSecSiteConnection(v) for v in ipsecsiteconnections]

2
openstack_dashboard/dashboards/admin/networks/forms.py
View File

@ -113,7 +113,7 @@ class UpdateNetwork(forms.SelfHandlingForm):
'admin_state_up': data['admin_state'], 'admin_state_up': data['admin_state'],
'shared': data['shared'], 'shared': data['shared'],
'router:external': data['external']} 'router:external': data['external']}
network = api.neutron.network_modify(request, data['network_id'], network = api.neutron.network_update(request, data['network_id'],
**params) **params)
msg = _('Network %s was successfully updated.') % data['name'] msg = _('Network %s was successfully updated.') % data['name']
LOG.debug(msg) LOG.debug(msg)

2
openstack_dashboard/dashboards/admin/networks/ports/forms.py
View File

@ -87,7 +87,7 @@ class UpdatePort(project_forms.UpdatePort):
def handle(self, request, data): def handle(self, request, data):
try: try:
LOG.debug('params = %s' % data) LOG.debug('params = %s' % data)
port = api.neutron.port_modify(request, data['port_id'], port = api.neutron.port_update(request, data['port_id'],
name=data['name'], name=data['name'],
admin_state_up=data['admin_state'], admin_state_up=data['admin_state'],
device_id=data['device_id'], device_id=data['device_id'],

22
openstack_dashboard/dashboards/admin/networks/tests.py
View File

@ -276,7 +276,7 @@ class NetworkTests(test.BaseAdminViewTests):
redir_url = INDEX_URL redir_url = INDEX_URL
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('network_modify', @test.create_stubs({api.neutron: ('network_update',
'network_get',)}) 'network_get',)})
def test_network_update_post(self): def test_network_update_post(self):
network = self.networks.first() network = self.networks.first()
@ -284,7 +284,7 @@ class NetworkTests(test.BaseAdminViewTests):
'shared': True, 'shared': True,
'admin_state_up': network.admin_state_up, 'admin_state_up': network.admin_state_up,
'router:external': True} 'router:external': True}
api.neutron.network_modify(IsA(http.HttpRequest), network.id, api.neutron.network_update(IsA(http.HttpRequest), network.id,
**params)\ **params)\
.AndReturn(network) .AndReturn(network)
api.neutron.network_get(IsA(http.HttpRequest), network.id)\ api.neutron.network_get(IsA(http.HttpRequest), network.id)\
@ -302,7 +302,7 @@ class NetworkTests(test.BaseAdminViewTests):
self.assertRedirectsNoFollow(res, INDEX_URL) self.assertRedirectsNoFollow(res, INDEX_URL)
@test.create_stubs({api.neutron: ('network_modify', @test.create_stubs({api.neutron: ('network_update',
'network_get',)}) 'network_get',)})
def test_network_update_post_exception(self): def test_network_update_post_exception(self):
network = self.networks.first() network = self.networks.first()
@ -310,7 +310,7 @@ class NetworkTests(test.BaseAdminViewTests):
'shared': False, 'shared': False,
'admin_state_up': network.admin_state_up, 'admin_state_up': network.admin_state_up,
'router:external': False} 'router:external': False}
api.neutron.network_modify(IsA(http.HttpRequest), network.id, api.neutron.network_update(IsA(http.HttpRequest), network.id,
**params)\ **params)\
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
api.neutron.network_get(IsA(http.HttpRequest), network.id)\ api.neutron.network_get(IsA(http.HttpRequest), network.id)\
@ -540,7 +540,7 @@ class NetworkSubnetTests(test.BaseAdminViewTests):
self.assertContains(res, 'Gateway IP and IP version are inconsistent.') self.assertContains(res, 'Gateway IP and IP version are inconsistent.')
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post(self): def test_subnet_update_post(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -548,7 +548,7 @@ class NetworkSubnetTests(test.BaseAdminViewTests):
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\ api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_modify(IsA(http.HttpRequest), subnet.id, api.neutron.subnet_update(IsA(http.HttpRequest), subnet.id,
name=subnet.name, name=subnet.name,
enable_dhcp=subnet.enable_dhcp, enable_dhcp=subnet.enable_dhcp,
dns_nameservers=[], dns_nameservers=[],
@ -565,7 +565,7 @@ class NetworkSubnetTests(test.BaseAdminViewTests):
args=[subnet.network_id]) args=[subnet.network_id])
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_gw_inconsistent(self): def test_subnet_update_post_gw_inconsistent(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -758,12 +758,12 @@ class NetworkPortTests(test.BaseAdminViewTests):
self.assertTemplateUsed(res, 'admin/networks/ports/update.html') self.assertTemplateUsed(res, 'admin/networks/ports/update.html')
@test.create_stubs({api.neutron: ('port_get', @test.create_stubs({api.neutron: ('port_get',
'port_modify')}) 'port_update')})
def test_port_update_post(self): def test_port_update_post(self):
port = self.ports.first() port = self.ports.first()
api.neutron.port_get(IsA(http.HttpRequest), port.id)\ api.neutron.port_get(IsA(http.HttpRequest), port.id)\
.AndReturn(port) .AndReturn(port)
api.neutron.port_modify(IsA(http.HttpRequest), port.id, api.neutron.port_update(IsA(http.HttpRequest), port.id,
name=port.name, name=port.name,
admin_state_up=port.admin_state_up, admin_state_up=port.admin_state_up,
device_id=port.device_id, device_id=port.device_id,
@ -786,12 +786,12 @@ class NetworkPortTests(test.BaseAdminViewTests):
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('port_get', @test.create_stubs({api.neutron: ('port_get',
'port_modify')}) 'port_update')})
def test_port_update_post_exception(self): def test_port_update_post_exception(self):
port = self.ports.first() port = self.ports.first()
api.neutron.port_get(IsA(http.HttpRequest), port.id)\ api.neutron.port_get(IsA(http.HttpRequest), port.id)\
.AndReturn(port) .AndReturn(port)
api.neutron.port_modify(IsA(http.HttpRequest), port.id, api.neutron.port_update(IsA(http.HttpRequest), port.id,
name=port.name, name=port.name,
admin_state_up=port.admin_state_up, admin_state_up=port.admin_state_up,
device_id=port.device_id, device_id=port.device_id,

6
openstack_dashboard/dashboards/project/firewalls/forms.py
View File

@ -156,7 +156,7 @@ class UpdateFirewall(forms.SelfHandlingForm):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
policies = api.fwaas.policies_list(request, tenant_id=tenant_id) policies = api.fwaas.policy_list(request, tenant_id=tenant_id)
policies = sorted(policies, key=lambda policy: policy.name) policies = sorted(policies, key=lambda policy: policy.name)
except Exception: except Exception:
exceptions.handle(request, exceptions.handle(request,
@ -206,7 +206,7 @@ class InsertRuleToPolicy(forms.SelfHandlingForm):
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
try: try:
all_rules = api.fwaas.rules_list(request, tenant_id=tenant_id) all_rules = api.fwaas.rule_list(request, tenant_id=tenant_id)
for r in all_rules: for r in all_rules:
r.set_id_as_name_if_empty() r.set_id_as_name_if_empty()
all_rules = sorted(all_rules, key=lambda rule: rule.name) all_rules = sorted(all_rules, key=lambda rule: rule.name)
@ -268,7 +268,7 @@ class RemoveRuleFromPolicy(forms.SelfHandlingForm):
tenant_id = request.user.tenant_id tenant_id = request.user.tenant_id
try: try:
all_rules = api.fwaas.rules_list(request, tenant_id=tenant_id) all_rules = api.fwaas.rule_list(request, tenant_id=tenant_id)
for r in all_rules: for r in all_rules:
r.set_id_as_name_if_empty() r.set_id_as_name_if_empty()

8
openstack_dashboard/dashboards/project/firewalls/tabs.py
View File

@ -38,7 +38,7 @@ class RulesTab(tabs.TableTab):
def get_rulestable_data(self): def get_rulestable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
rules = api.fwaas.rules_list(self.tab_group.request, rules = api.fwaas.rule_list(self.tab_group.request,
tenant_id=tenant_id) tenant_id=tenant_id)
except Exception: except Exception:
rules = [] rules = []
@ -59,8 +59,8 @@ class PoliciesTab(tabs.TableTab):
def get_policiestable_data(self): def get_policiestable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
policies = api.fwaas.policies_list(self.tab_group.request, policies = api.fwaas.policy_list(self.tab_group.request,
tenant_id=tenant_id) tenant_id=tenant_id)
except Exception: except Exception:
policies = [] policies = []
exceptions.handle(self.tab_group.request, exceptions.handle(self.tab_group.request,
@ -80,7 +80,7 @@ class FirewallsTab(tabs.TableTab):
def get_firewallstable_data(self): def get_firewallstable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
firewalls = api.fwaas.firewalls_list(self.tab_group.request, firewalls = api.fwaas.firewall_list(self.tab_group.request,
tenant_id=tenant_id) tenant_id=tenant_id)
except Exception: except Exception:
firewalls = [] firewalls = []

78
openstack_dashboard/dashboards/project/firewalls/tests.py
View File

@ -56,36 +56,36 @@ class FirewallTests(test.TestCase):
# retrieve rules # retrieve rules
tenant_id = self.tenant.id tenant_id = self.tenant.id
api.fwaas.rules_list( api.fwaas.rule_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=tenant_id).AndReturn(self.fw_rules.list()) tenant_id=tenant_id).AndReturn(self.fw_rules.list())
# retrieves policies # retrieves policies
policies = self.fw_policies.list() policies = self.fw_policies.list()
api.fwaas.policies_list( api.fwaas.policy_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies)
# retrieves firewalls # retrieves firewalls
firewalls = self.firewalls.list() firewalls = self.firewalls.list()
api.fwaas.firewalls_list( api.fwaas.firewall_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(firewalls) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(firewalls)
def set_up_expect_with_exception(self): def set_up_expect_with_exception(self):
tenant_id = self.tenant.id tenant_id = self.tenant.id
api.fwaas.rules_list( api.fwaas.rule_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=tenant_id).AndRaise(self.exceptions.neutron) tenant_id=tenant_id).AndRaise(self.exceptions.neutron)
api.fwaas.policies_list( api.fwaas.policy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=tenant_id).AndRaise(self.exceptions.neutron) tenant_id=tenant_id).AndRaise(self.exceptions.neutron)
api.fwaas.firewalls_list( api.fwaas.firewall_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=tenant_id).AndRaise(self.exceptions.neutron) tenant_id=tenant_id).AndRaise(self.exceptions.neutron)
@test.create_stubs({api.fwaas: ('firewalls_list', @test.create_stubs({api.fwaas: ('firewall_list',
'policies_list', 'policy_list',
'rules_list')}, ) 'rule_list')}, )
def test_index_firewalls(self): def test_index_firewalls(self):
self.set_up_expect() self.set_up_expect()
@ -101,9 +101,9 @@ class FirewallTests(test.TestCase):
self.assertEqual(len(res.context['table'].data), self.assertEqual(len(res.context['table'].data),
len(self.firewalls.list())) len(self.firewalls.list()))
@test.create_stubs({api.fwaas: ('firewalls_list', @test.create_stubs({api.fwaas: ('firewall_list',
'policies_list', 'policy_list',
'rules_list')}, ) 'rule_list')}, )
def test_index_policies(self): def test_index_policies(self):
self.set_up_expect() self.set_up_expect()
@ -120,9 +120,9 @@ class FirewallTests(test.TestCase):
self.assertEqual(len(res.context['policiestable_table'].data), self.assertEqual(len(res.context['policiestable_table'].data),
len(self.fw_policies.list())) len(self.fw_policies.list()))
@test.create_stubs({api.fwaas: ('firewalls_list', @test.create_stubs({api.fwaas: ('firewall_list',
'policies_list', 'policy_list',
'rules_list')}, ) 'rule_list')}, )
def test_index_rules(self): def test_index_rules(self):
self.set_up_expect() self.set_up_expect()
@ -139,9 +139,9 @@ class FirewallTests(test.TestCase):
self.assertEqual(len(res.context['rulestable_table'].data), self.assertEqual(len(res.context['rulestable_table'].data),
len(self.fw_rules.list())) len(self.fw_rules.list()))
@test.create_stubs({api.fwaas: ('firewalls_list', @test.create_stubs({api.fwaas: ('firewall_list',
'policies_list', 'policy_list',
'rules_list')}, ) 'rule_list')}, )
def test_index_exception_firewalls(self): def test_index_exception_firewalls(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -158,9 +158,9 @@ class FirewallTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['table'].data), 0) self.assertEqual(len(res.context['table'].data), 0)
@test.create_stubs({api.fwaas: ('firewalls_list', @test.create_stubs({api.fwaas: ('firewall_list',
'policies_list', 'policy_list',
'rules_list')}, ) 'rule_list')}, )
def test_index_exception_policies(self): def test_index_exception_policies(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -178,9 +178,9 @@ class FirewallTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['policiestable_table'].data), 0) self.assertEqual(len(res.context['policiestable_table'].data), 0)
@test.create_stubs({api.fwaas: ('firewalls_list', @test.create_stubs({api.fwaas: ('firewall_list',
'policies_list', 'policy_list',
'rules_list')}, ) 'rule_list')}, )
def test_index_exception_rules(self): def test_index_exception_rules(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -245,7 +245,7 @@ class FirewallTests(test.TestCase):
self.assertFormErrors(res, 2) self.assertFormErrors(res, 2)
@test.create_stubs({api.fwaas: ('policy_create', 'rules_list'), }) @test.create_stubs({api.fwaas: ('policy_create', 'rule_list'), })
def test_add_policy_post(self): def test_add_policy_post(self):
policy = self.fw_policies.first() policy = self.fw_policies.first()
rules = self.fw_rules.list() rules = self.fw_rules.list()
@ -271,7 +271,7 @@ class FirewallTests(test.TestCase):
for rule in rules: for rule in rules:
if rule.id in policy.firewall_rules: if rule.id in policy.firewall_rules:
rule.firewall_policy_id = rule.policy = None rule.firewall_policy_id = rule.policy = None
api.fwaas.rules_list( api.fwaas.rule_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules)
api.fwaas.policy_create( api.fwaas.policy_create(
IsA(http.HttpRequest), **form_data).AndReturn(policy) IsA(http.HttpRequest), **form_data).AndReturn(policy)
@ -283,7 +283,7 @@ class FirewallTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.fwaas: ('policy_create', 'rules_list'), }) @test.create_stubs({api.fwaas: ('policy_create', 'rule_list'), })
def test_add_policy_post_with_error(self): def test_add_policy_post_with_error(self):
policy = self.fw_policies.first() policy = self.fw_policies.first()
rules = self.fw_rules.list() rules = self.fw_rules.list()
@ -293,7 +293,7 @@ class FirewallTests(test.TestCase):
'shared': policy.shared, 'shared': policy.shared,
'audited': policy.audited 'audited': policy.audited
} }
api.fwaas.rules_list( api.fwaas.rule_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -302,7 +302,7 @@ class FirewallTests(test.TestCase):
self.assertFormErrors(res, 1) self.assertFormErrors(res, 1)
@test.create_stubs({api.fwaas: ('firewall_create', 'policies_list'), }) @test.create_stubs({api.fwaas: ('firewall_create', 'policy_list'), })
def test_add_firewall_post(self): def test_add_firewall_post(self):
firewall = self.firewalls.first() firewall = self.firewalls.first()
policies = self.fw_policies.list() policies = self.fw_policies.list()
@ -313,7 +313,7 @@ class FirewallTests(test.TestCase):
'shared': firewall.shared, 'shared': firewall.shared,
'admin_state_up': firewall.admin_state_up 'admin_state_up': firewall.admin_state_up
} }
api.fwaas.policies_list( api.fwaas.policy_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies)
api.fwaas.firewall_create( api.fwaas.firewall_create(
IsA(http.HttpRequest), **form_data).AndReturn(firewall) IsA(http.HttpRequest), **form_data).AndReturn(firewall)
@ -325,7 +325,7 @@ class FirewallTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.fwaas: ('firewall_create', 'policies_list'), }) @test.create_stubs({api.fwaas: ('firewall_create', 'policy_list'), })
def test_add_firewall_post_with_error(self): def test_add_firewall_post_with_error(self):
firewall = self.firewalls.first() firewall = self.firewalls.first()
policies = self.fw_policies.list() policies = self.fw_policies.list()
@ -336,7 +336,7 @@ class FirewallTests(test.TestCase):
'shared': firewall.shared, 'shared': firewall.shared,
'admin_state_up': firewall.admin_state_up 'admin_state_up': firewall.admin_state_up
} }
api.fwaas.policies_list( api.fwaas.policy_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -394,7 +394,7 @@ class FirewallTests(test.TestCase):
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.fwaas: ('policy_get', 'policy_update', @test.create_stubs({api.fwaas: ('policy_get', 'policy_update',
'rules_list')}) 'rule_list')})
def test_update_policy_post(self): def test_update_policy_post(self):
policy = self.fw_policies.first() policy = self.fw_policies.first()
@ -423,7 +423,7 @@ class FirewallTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.fwaas: ('firewall_get', 'policies_list', @test.create_stubs({api.fwaas: ('firewall_get', 'policy_list',
'firewall_update')}) 'firewall_update')})
def test_update_firewall_post(self): def test_update_firewall_post(self):
firewall = self.firewalls.first() firewall = self.firewalls.first()
@ -442,7 +442,7 @@ class FirewallTests(test.TestCase):
} }
policies = self.fw_policies.list() policies = self.fw_policies.list()
api.fwaas.policies_list( api.fwaas.policy_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(policies)
api.fwaas.firewall_update(IsA(http.HttpRequest), firewall.id, **data)\ api.fwaas.firewall_update(IsA(http.HttpRequest), firewall.id, **data)\
@ -457,7 +457,7 @@ class FirewallTests(test.TestCase):
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.fwaas: ('policy_get', 'policy_insert_rule', @test.create_stubs({api.fwaas: ('policy_get', 'policy_insert_rule',
'rules_list', 'rule_get')}) 'rule_list', 'rule_get')})
def test_policy_insert_rule(self): def test_policy_insert_rule(self):
policy = self.fw_policies.first() policy = self.fw_policies.first()
tenant_id = self.tenant.id tenant_id = self.tenant.id
@ -476,7 +476,7 @@ class FirewallTests(test.TestCase):
new_rule_id, new_rule_id,
rules[1].id] rules[1].id]
api.fwaas.rules_list( api.fwaas.rule_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules)
api.fwaas.rule_get( api.fwaas.rule_get(
IsA(http.HttpRequest), new_rule_id).AndReturn(rules[2]) IsA(http.HttpRequest), new_rule_id).AndReturn(rules[2])
@ -492,7 +492,7 @@ class FirewallTests(test.TestCase):
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.fwaas: ('policy_get', 'policy_remove_rule', @test.create_stubs({api.fwaas: ('policy_get', 'policy_remove_rule',
'rules_list', 'rule_get')}) 'rule_list', 'rule_get')})
def test_policy_remove_rule(self): def test_policy_remove_rule(self):
policy = self.fw_policies.first() policy = self.fw_policies.first()
tenant_id = self.tenant.id tenant_id = self.tenant.id
@ -514,7 +514,7 @@ class FirewallTests(test.TestCase):
api.fwaas.policy_get(IsA(http.HttpRequest), api.fwaas.policy_get(IsA(http.HttpRequest),
policy.id).AndReturn(policy) policy.id).AndReturn(policy)
api.fwaas.rules_list( api.fwaas.rule_list(
IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules) IsA(http.HttpRequest), tenant_id=tenant_id).AndReturn(rules)
api.fwaas.rule_get( api.fwaas.rule_get(
IsA(http.HttpRequest), remove_rule_id).AndReturn(rules[0]) IsA(http.HttpRequest), remove_rule_id).AndReturn(rules[0])

4
openstack_dashboard/dashboards/project/firewalls/workflows.py
View File

@ -145,7 +145,7 @@ class SelectRulesAction(workflows.Action):
def populate_rule_choices(self, request, context): def populate_rule_choices(self, request, context):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
rules = api.fwaas.rules_list(request, tenant_id=tenant_id) rules = api.fwaas.rule_list(request, tenant_id=tenant_id)
for r in rules: for r in rules:
r.set_id_as_name_if_empty() r.set_id_as_name_if_empty()
rules = sorted(rules, rules = sorted(rules,
@ -254,7 +254,7 @@ class AddFirewallAction(workflows.Action):
firewall_policy_id_choices = [('', _("Select a Policy"))] firewall_policy_id_choices = [('', _("Select a Policy"))]
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
policies = api.fwaas.policies_list(request, tenant_id=tenant_id) policies = api.fwaas.policy_list(request, tenant_id=tenant_id)
policies = sorted(policies, key=lambda policy: policy.name) policies = sorted(policies, key=lambda policy: policy.name)
except Exception as e: except Exception as e:
exceptions.handle( exceptions.handle(

4
openstack_dashboard/dashboards/project/loadbalancers/forms.py
View File

@ -101,7 +101,7 @@ class UpdateVip(forms.SelfHandlingForm):
pool_id_choices = [] pool_id_choices = []
try: try:
tenant_id = request.user.tenant_id tenant_id = request.user.tenant_id
pools = api.lbaas.pools_get(request, tenant_id=tenant_id) pools = api.lbaas.pool_list(request, tenant_id=tenant_id)
except Exception: except Exception:
pools = [] pools = []
exceptions.handle(request, exceptions.handle(request,
@ -181,7 +181,7 @@ class UpdateMember(forms.SelfHandlingForm):
pool_id_choices = [] pool_id_choices = []
try: try:
tenant_id = request.user.tenant_id tenant_id = request.user.tenant_id
pools = api.lbaas.pools_get(request, tenant_id=tenant_id) pools = api.lbaas.pool_list(request, tenant_id=tenant_id)
except Exception: except Exception:
pools = [] pools = []
exceptions.handle(request, exceptions.handle(request,

2
openstack_dashboard/dashboards/project/loadbalancers/tables.py
View File

@ -171,7 +171,7 @@ class AddPMAssociationLink(tables.LinkAction):
def allowed(self, request, datum=None): def allowed(self, request, datum=None):
try: try:
tenant_id = request.user.tenant_id tenant_id = request.user.tenant_id
monitors = api.lbaas.pool_health_monitors_get(request, monitors = api.lbaas.pool_health_monitor_list(request,
tenant_id=tenant_id) tenant_id=tenant_id)
for m in monitors: for m in monitors:
if m.id not in datum['health_monitors']: if m.id not in datum['health_monitors']:

6
openstack_dashboard/dashboards/project/loadbalancers/tabs.py
View File

@ -34,7 +34,7 @@ class PoolsTab(tabs.TableTab):
def get_poolstable_data(self): def get_poolstable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
pools = api.lbaas.pools_get(self.tab_group.request, pools = api.lbaas.pool_list(self.tab_group.request,
tenant_id=tenant_id) tenant_id=tenant_id)
poolsFormatted = [p.readable(self.tab_group.request) for poolsFormatted = [p.readable(self.tab_group.request) for
p in pools] p in pools]
@ -54,7 +54,7 @@ class MembersTab(tabs.TableTab):
def get_memberstable_data(self): def get_memberstable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
members = api.lbaas.members_get(self.tab_group.request, members = api.lbaas.member_list(self.tab_group.request,
tenant_id=tenant_id) tenant_id=tenant_id)
membersFormatted = [m.readable(self.tab_group.request) for membersFormatted = [m.readable(self.tab_group.request) for
m in members] m in members]
@ -74,7 +74,7 @@ class MonitorsTab(tabs.TableTab):
def get_monitorstable_data(self): def get_monitorstable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
monitors = api.lbaas.pool_health_monitors_get( monitors = api.lbaas.pool_health_monitor_list(
self.tab_group.request, tenant_id=tenant_id) self.tab_group.request, tenant_id=tenant_id)
except Exception: except Exception:
monitors = [] monitors = []

86
openstack_dashboard/dashboards/project/loadbalancers/tests.py
View File

@ -62,7 +62,7 @@ class LoadBalancerTests(test.TestCase):
vip2 = self.vips.list()[1] vip2 = self.vips.list()[1]
api.lbaas.pools_get( api.lbaas.pool_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
@ -70,7 +70,7 @@ class LoadBalancerTests(test.TestCase):
api.lbaas.vip_get(IsA(http.HttpRequest), vip2.id).AndReturn(vip2) api.lbaas.vip_get(IsA(http.HttpRequest), vip2.id).AndReturn(vip2)
# retrieves members # retrieves members
api.lbaas.members_get( api.lbaas.member_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.members.list()) .AndReturn(self.members.list())
@ -83,24 +83,24 @@ class LoadBalancerTests(test.TestCase):
self.members.list()[1].pool_id).AndReturn(pool2) self.members.list()[1].pool_id).AndReturn(pool2)
# retrieves monitors # retrieves monitors
api.lbaas.pool_health_monitors_get( api.lbaas.pool_health_monitor_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id).MultipleTimes() \ IsA(http.HttpRequest), tenant_id=self.tenant.id).MultipleTimes() \
.AndReturn(self.monitors.list()) .AndReturn(self.monitors.list())
def set_up_expect_with_exception(self): def set_up_expect_with_exception(self):
api.lbaas.pools_get( api.lbaas.pool_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
api.lbaas.members_get( api.lbaas.member_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
api.lbaas.pool_health_monitors_get( api.lbaas.pool_health_monitor_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
@test.create_stubs({api.lbaas: ('pools_get', 'vip_get', @test.create_stubs({api.lbaas: ('pool_list', 'vip_get',
'members_get', 'pool_get', 'member_list', 'pool_get',
'pool_health_monitors_get'), 'pool_health_monitor_list'),
api.neutron: ('subnet_get',)}) api.neutron: ('subnet_get',)})
def test_index_pools(self): def test_index_pools(self):
self.set_up_expect() self.set_up_expect()
@ -115,9 +115,9 @@ class LoadBalancerTests(test.TestCase):
self.assertEqual(len(res.context['table'].data), self.assertEqual(len(res.context['table'].data),
len(self.pools.list())) len(self.pools.list()))
@test.create_stubs({api.lbaas: ('pools_get', 'vip_get', @test.create_stubs({api.lbaas: ('pool_list', 'vip_get',
'members_get', 'pool_get', 'member_list', 'pool_get',
'pool_health_monitors_get'), 'pool_health_monitor_list'),
api.neutron: ('subnet_get',)}) api.neutron: ('subnet_get',)})
def test_index_members(self): def test_index_members(self):
self.set_up_expect() self.set_up_expect()
@ -132,9 +132,9 @@ class LoadBalancerTests(test.TestCase):
self.assertEqual(len(res.context['memberstable_table'].data), self.assertEqual(len(res.context['memberstable_table'].data),
len(self.members.list())) len(self.members.list()))
@test.create_stubs({api.lbaas: ('pools_get', 'vip_get', @test.create_stubs({api.lbaas: ('pool_list', 'vip_get',
'pool_health_monitors_get', 'pool_health_monitor_list',
'members_get', 'pool_get'), 'member_list', 'pool_get'),
api.neutron: ('subnet_get',)}) api.neutron: ('subnet_get',)})
def test_index_monitors(self): def test_index_monitors(self):
self.set_up_expect() self.set_up_expect()
@ -149,8 +149,8 @@ class LoadBalancerTests(test.TestCase):
self.assertEqual(len(res.context['monitorstable_table'].data), self.assertEqual(len(res.context['monitorstable_table'].data),
len(self.monitors.list())) len(self.monitors.list()))
@test.create_stubs({api.lbaas: ('pools_get', 'members_get', @test.create_stubs({api.lbaas: ('pool_list', 'member_list',
'pool_health_monitors_get')}) 'pool_health_monitor_list')})
def test_index_exception_pools(self): def test_index_exception_pools(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -165,8 +165,8 @@ class LoadBalancerTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['table'].data), 0) self.assertEqual(len(res.context['table'].data), 0)
@test.create_stubs({api.lbaas: ('pools_get', 'members_get', @test.create_stubs({api.lbaas: ('pool_list', 'member_list',
'pool_health_monitors_get')}) 'pool_health_monitor_list')})
def test_index_exception_members(self): def test_index_exception_members(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -181,8 +181,8 @@ class LoadBalancerTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['memberstable_table'].data), 0) self.assertEqual(len(res.context['memberstable_table'].data), 0)
@test.create_stubs({api.lbaas: ('pools_get', 'members_get', @test.create_stubs({api.lbaas: ('pool_list', 'member_list',
'pool_health_monitors_get')}) 'pool_health_monitor_list')})
def test_index_exception_monitors(self): def test_index_exception_monitors(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -491,7 +491,7 @@ class LoadBalancerTests(test.TestCase):
def test_add_member_post_without_weight(self): def test_add_member_post_without_weight(self):
self._test_add_member_post(with_weight=False) self._test_add_member_post(with_weight=False)
@test.create_stubs({api.lbaas: ('pools_get', 'member_create'), @test.create_stubs({api.lbaas: ('pool_list', 'member_create'),
api.neutron: ('port_list',), api.neutron: ('port_list',),
api.nova: ('server_list',)}) api.nova: ('server_list',)})
def _test_add_member_post(self, with_weight=True): def _test_add_member_post(self, with_weight=True):
@ -507,7 +507,7 @@ class LoadBalancerTests(test.TestCase):
port1 = self.AttributeDict( port1 = self.AttributeDict(
{'fixed_ips': [{'ip_address': member.address}]}) {'fixed_ips': [{'ip_address': member.address}]})
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.nova.server_list(IsA(http.HttpRequest)).AndReturn( api.nova.server_list(IsA(http.HttpRequest)).AndReturn(
@ -542,7 +542,7 @@ class LoadBalancerTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.lbaas: ('pools_get',), @test.create_stubs({api.lbaas: ('pool_list',),
api.nova: ('server_list',)}) api.nova: ('server_list',)})
def test_add_member_post_with_error(self): def test_add_member_post_with_error(self):
member = self.members.first() member = self.members.first()
@ -554,7 +554,7 @@ class LoadBalancerTests(test.TestCase):
'12381d38-c3eb-4fee-9763-12de3338043e', '12381d38-c3eb-4fee-9763-12de3338043e',
'name': 'vm2'}) 'name': 'vm2'})
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.nova.server_list(IsA(http.HttpRequest)).AndReturn([[server1, api.nova.server_list(IsA(http.HttpRequest)).AndReturn([[server1,
@ -575,7 +575,7 @@ class LoadBalancerTests(test.TestCase):
self.assertFormErrors(res, 2) self.assertFormErrors(res, 2)
@test.create_stubs({api.lbaas: ('pools_get',), @test.create_stubs({api.lbaas: ('pool_list',),
api.nova: ('server_list',)}) api.nova: ('server_list',)})
def test_add_member_get(self): def test_add_member_get(self):
server1 = self.AttributeDict({'id': server1 = self.AttributeDict({'id':
@ -585,7 +585,7 @@ class LoadBalancerTests(test.TestCase):
'12381d38-c3eb-4fee-9763-12de3338043e', '12381d38-c3eb-4fee-9763-12de3338043e',
'name': 'vm2'}) 'name': 'vm2'})
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.nova.server_list( api.nova.server_list(
IsA(http.HttpRequest)).AndReturn([[server1, server2], False]) IsA(http.HttpRequest)).AndReturn([[server1, server2], False])
@ -638,12 +638,12 @@ class LoadBalancerTests(test.TestCase):
self.assertTemplateUsed(res, 'project/loadbalancers/updatepool.html') self.assertTemplateUsed(res, 'project/loadbalancers/updatepool.html')
@test.create_stubs({api.lbaas: ('pools_get', 'vip_get', @test.create_stubs({api.lbaas: ('pool_list', 'vip_get',
'vip_update')}) 'vip_update')})
def test_update_vip_post(self): def test_update_vip_post(self):
vip = self.vips.first() vip = self.vips.first()
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.lbaas.vip_get(IsA(http.HttpRequest), vip.id).AndReturn(vip) api.lbaas.vip_get(IsA(http.HttpRequest), vip.id).AndReturn(vip)
@ -668,11 +668,11 @@ class LoadBalancerTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.lbaas: ('vip_get', 'pools_get')}) @test.create_stubs({api.lbaas: ('vip_get', 'pool_list')})
def test_update_vip_get(self): def test_update_vip_get(self):
vip = self.vips.first() vip = self.vips.first()
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.lbaas.vip_get(IsA(http.HttpRequest), vip.id).AndReturn(vip) api.lbaas.vip_get(IsA(http.HttpRequest), vip.id).AndReturn(vip)
@ -682,12 +682,12 @@ class LoadBalancerTests(test.TestCase):
self.assertTemplateUsed(res, 'project/loadbalancers/updatevip.html') self.assertTemplateUsed(res, 'project/loadbalancers/updatevip.html')
@test.create_stubs({api.lbaas: ('pools_get', 'member_get', @test.create_stubs({api.lbaas: ('pool_list', 'member_get',
'member_update')}) 'member_update')})
def test_update_member_post(self): def test_update_member_post(self):
member = self.members.first() member = self.members.first()
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.lbaas.member_get(IsA(http.HttpRequest), member.id)\ api.lbaas.member_get(IsA(http.HttpRequest), member.id)\
.AndReturn(member) .AndReturn(member)
@ -710,11 +710,11 @@ class LoadBalancerTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.lbaas: ('member_get', 'pools_get')}) @test.create_stubs({api.lbaas: ('member_get', 'pool_list')})
def test_update_member_get(self): def test_update_member_get(self):
member = self.members.first() member = self.members.first()
api.lbaas.pools_get(IsA(http.HttpRequest), tenant_id=self.tenant.id) \ api.lbaas.pool_list(IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.pools.list()) .AndReturn(self.pools.list())
api.lbaas.member_get(IsA(http.HttpRequest), member.id)\ api.lbaas.member_get(IsA(http.HttpRequest), member.id)\
.AndReturn(member) .AndReturn(member)
@ -768,7 +768,7 @@ class LoadBalancerTests(test.TestCase):
self.assertTemplateUsed( self.assertTemplateUsed(
res, 'project/loadbalancers/updatemonitor.html') res, 'project/loadbalancers/updatemonitor.html')
@test.create_stubs({api.lbaas: ('pool_get', 'pool_health_monitors_get', @test.create_stubs({api.lbaas: ('pool_get', 'pool_health_monitor_list',
'pool_monitor_association_create')}) 'pool_monitor_association_create')})
def test_add_pool_monitor_association_post(self): def test_add_pool_monitor_association_post(self):
pool = self.pools.first() pool = self.pools.first()
@ -776,7 +776,7 @@ class LoadBalancerTests(test.TestCase):
monitor = self.monitors.list()[1] monitor = self.monitors.list()[1]
api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool) api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool)
api.lbaas.pool_health_monitors_get( api.lbaas.pool_health_monitor_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(monitors) tenant_id=self.tenant.id).AndReturn(monitors)
@ -800,13 +800,13 @@ class LoadBalancerTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.lbaas: ('pool_get', 'pool_health_monitors_get')}) @test.create_stubs({api.lbaas: ('pool_get', 'pool_health_monitor_list')})
def test_add_pool_monitor_association_get(self): def test_add_pool_monitor_association_get(self):
pool = self.pools.first() pool = self.pools.first()
monitors = self.monitors.list() monitors = self.monitors.list()
api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool) api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool)
api.lbaas.pool_health_monitors_get( api.lbaas.pool_health_monitor_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(monitors) tenant_id=self.tenant.id).AndReturn(monitors)
@ -822,7 +822,7 @@ class LoadBalancerTests(test.TestCase):
self.assertQuerysetEqual(workflow.steps, expected_objs) self.assertQuerysetEqual(workflow.steps, expected_objs)
@test.create_stubs({api.lbaas: ('pool_get', @test.create_stubs({api.lbaas: ('pool_get',
'pool_health_monitors_get', 'pool_health_monitor_list',
'pool_monitor_association_delete')}) 'pool_monitor_association_delete')})
def test_delete_pool_monitor_association_post(self): def test_delete_pool_monitor_association_post(self):
pool = self.pools.first() pool = self.pools.first()
@ -830,7 +830,7 @@ class LoadBalancerTests(test.TestCase):
monitor = monitors[0] monitor = monitors[0]
api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool) api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool)
api.lbaas.pool_health_monitors_get( api.lbaas.pool_health_monitor_list(
IsA(http.HttpRequest)).AndReturn(monitors) IsA(http.HttpRequest)).AndReturn(monitors)
api.lbaas.pool_monitor_association_delete( api.lbaas.pool_monitor_association_delete(
@ -854,13 +854,13 @@ class LoadBalancerTests(test.TestCase):
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.lbaas: ('pool_get', @test.create_stubs({api.lbaas: ('pool_get',
'pool_health_monitors_get')}) 'pool_health_monitor_list')})
def test_delete_pool_monitor_association_get(self): def test_delete_pool_monitor_association_get(self):
pool = self.pools.first() pool = self.pools.first()
monitors = self.monitors.list() monitors = self.monitors.list()
api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool) api.lbaas.pool_get(IsA(http.HttpRequest), pool.id).AndReturn(pool)
api.lbaas.pool_health_monitors_get( api.lbaas.pool_health_monitor_list(
IsA(http.HttpRequest)).AndReturn(monitors) IsA(http.HttpRequest)).AndReturn(monitors)
self.mox.ReplayAll() self.mox.ReplayAll()

6
openstack_dashboard/dashboards/project/loadbalancers/workflows.py
View File

@ -320,7 +320,7 @@ class AddMemberAction(workflows.Action):
pool_id_choices = [('', _("Select a Pool"))] pool_id_choices = [('', _("Select a Pool"))]
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
pools = api.lbaas.pools_get(request, tenant_id=tenant_id) pools = api.lbaas.pool_list(request, tenant_id=tenant_id)
except Exception: except Exception:
pools = [] pools = []
exceptions.handle(request, exceptions.handle(request,
@ -567,7 +567,7 @@ class AddPMAssociationAction(workflows.Action, MonitorMixin):
monitor_id_choices = [('', _("Select a Monitor"))] monitor_id_choices = [('', _("Select a Monitor"))]
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
monitors = api.lbaas.pool_health_monitors_get(request, monitors = api.lbaas.pool_health_monitor_list(request,
tenant_id=tenant_id) tenant_id=tenant_id)
for m in monitors: for m in monitors:
if m.id not in context['pool_monitors']: if m.id not in context['pool_monitors']:
@ -629,7 +629,7 @@ class DeletePMAssociationAction(workflows.Action, MonitorMixin):
monitor_id_choices = [('', _("Select a Monitor"))] monitor_id_choices = [('', _("Select a Monitor"))]
try: try:
monitors = api.lbaas.pool_health_monitors_get(request) monitors = api.lbaas.pool_health_monitor_list(request)
for m in monitors: for m in monitors:
if m.id in context['pool_monitors']: if m.id in context['pool_monitors']:
display_name = self._get_monitor_display_name(m) display_name = self._get_monitor_display_name(m)

2
openstack_dashboard/dashboards/project/networks/forms.py
View File

@ -46,7 +46,7 @@ class UpdateNetwork(forms.SelfHandlingForm):
try: try:
params = {'admin_state_up': data['admin_state'], params = {'admin_state_up': data['admin_state'],
'name': data['name']} 'name': data['name']}
network = api.neutron.network_modify(request, data['network_id'], network = api.neutron.network_update(request, data['network_id'],
**params) **params)
msg = _('Network %s was successfully updated.') % data['name'] msg = _('Network %s was successfully updated.') % data['name']
LOG.debug(msg) LOG.debug(msg)

2
openstack_dashboard/dashboards/project/networks/ports/forms.py
View File

@ -41,7 +41,7 @@ class UpdatePort(forms.SelfHandlingForm):
def handle(self, request, data): def handle(self, request, data):
try: try:
LOG.debug('params = %s' % data) LOG.debug('params = %s' % data)
port = api.neutron.port_modify(request, data['port_id'], port = api.neutron.port_update(request, data['port_id'],
name=data['name'], name=data['name'],
admin_state_up=data['admin_state']) admin_state_up=data['admin_state'])
msg = _('Port %s was successfully updated.') % data['port_id'] msg = _('Port %s was successfully updated.') % data['port_id']

2
openstack_dashboard/dashboards/project/networks/subnets/workflows.py
View File

@ -187,7 +187,7 @@ class UpdateSubnet(network_workflows.CreateNetwork):
self._setup_subnet_parameters(params, data, is_create=False) self._setup_subnet_parameters(params, data, is_create=False)
subnet = api.neutron.subnet_modify(request, subnet_id, **params) subnet = api.neutron.subnet_update(request, subnet_id, **params)
msg = _('Subnet "%s" was successfully updated.') % data['cidr'] msg = _('Subnet "%s" was successfully updated.') % data['cidr']
LOG.debug(msg) LOG.debug(msg)
return subnet return subnet

44
openstack_dashboard/dashboards/project/networks/tests.py
View File

@ -560,11 +560,11 @@ class NetworkTests(test.TestCase):
redir_url = INDEX_URL redir_url = INDEX_URL
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('network_modify', @test.create_stubs({api.neutron: ('network_update',
'network_get',)}) 'network_get',)})
def test_network_update_post(self): def test_network_update_post(self):
network = self.networks.first() network = self.networks.first()
api.neutron.network_modify(IsA(http.HttpRequest), network.id, api.neutron.network_update(IsA(http.HttpRequest), network.id,
name=network.name, name=network.name,
admin_state_up=network.admin_state_up)\ admin_state_up=network.admin_state_up)\
.AndReturn(network) .AndReturn(network)
@ -581,11 +581,11 @@ class NetworkTests(test.TestCase):
self.assertRedirectsNoFollow(res, INDEX_URL) self.assertRedirectsNoFollow(res, INDEX_URL)
@test.create_stubs({api.neutron: ('network_modify', @test.create_stubs({api.neutron: ('network_update',
'network_get',)}) 'network_get',)})
def test_network_update_post_exception(self): def test_network_update_post_exception(self):
network = self.networks.first() network = self.networks.first()
api.neutron.network_modify(IsA(http.HttpRequest), network.id, api.neutron.network_update(IsA(http.HttpRequest), network.id,
name=network.name, name=network.name,
admin_state_up=network.admin_state_up)\ admin_state_up=network.admin_state_up)\
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)
@ -1105,7 +1105,7 @@ class NetworkSubnetTests(test.TestCase):
'host_routes: Invalid IP address ' 'host_routes: Invalid IP address '
'(value=%s)' % host_routes.split(',')[1]) '(value=%s)' % host_routes.split(',')[1])
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post(self): def test_subnet_update_post(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1113,7 +1113,7 @@ class NetworkSubnetTests(test.TestCase):
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\ api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_modify(IsA(http.HttpRequest), subnet.id, api.neutron.subnet_update(IsA(http.HttpRequest), subnet.id,
name=subnet.name, name=subnet.name,
enable_dhcp=subnet.enable_dhcp, enable_dhcp=subnet.enable_dhcp,
dns_nameservers=[], dns_nameservers=[],
@ -1131,7 +1131,7 @@ class NetworkSubnetTests(test.TestCase):
args=[subnet.network_id]) args=[subnet.network_id])
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_with_gateway_ip(self): def test_subnet_update_post_with_gateway_ip(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1140,7 +1140,7 @@ class NetworkSubnetTests(test.TestCase):
api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\ api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\
.AndReturn(subnet) .AndReturn(subnet)
gateway_ip = '10.0.0.100' gateway_ip = '10.0.0.100'
api.neutron.subnet_modify(IsA(http.HttpRequest), subnet.id, api.neutron.subnet_update(IsA(http.HttpRequest), subnet.id,
name=subnet.name, name=subnet.name,
gateway_ip=gateway_ip, gateway_ip=gateway_ip,
enable_dhcp=subnet.enable_dhcp, enable_dhcp=subnet.enable_dhcp,
@ -1160,7 +1160,7 @@ class NetworkSubnetTests(test.TestCase):
args=[subnet.network_id]) args=[subnet.network_id])
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_no_gateway(self): def test_subnet_update_post_no_gateway(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1168,7 +1168,7 @@ class NetworkSubnetTests(test.TestCase):
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\ api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_modify(IsA(http.HttpRequest), subnet.id, api.neutron.subnet_update(IsA(http.HttpRequest), subnet.id,
name=subnet.name, name=subnet.name,
gateway_ip=None, gateway_ip=None,
enable_dhcp=subnet.enable_dhcp, enable_dhcp=subnet.enable_dhcp,
@ -1188,7 +1188,7 @@ class NetworkSubnetTests(test.TestCase):
args=[subnet.network_id]) args=[subnet.network_id])
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_with_additional_attributes(self): def test_subnet_update_post_with_additional_attributes(self):
subnet = self.subnets.list()[1] subnet = self.subnets.list()[1]
@ -1196,7 +1196,7 @@ class NetworkSubnetTests(test.TestCase):
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\ api.neutron.subnet_get(IsA(http.HttpRequest), subnet.id)\
.AndReturn(subnet) .AndReturn(subnet)
api.neutron.subnet_modify(IsA(http.HttpRequest), subnet.id, api.neutron.subnet_update(IsA(http.HttpRequest), subnet.id,
name=subnet.name, name=subnet.name,
enable_dhcp=False, enable_dhcp=False,
dns_nameservers=subnet.dns_nameservers, dns_nameservers=subnet.dns_nameservers,
@ -1214,7 +1214,7 @@ class NetworkSubnetTests(test.TestCase):
args=[subnet.network_id]) args=[subnet.network_id])
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_gw_inconsistent(self): def test_subnet_update_post_gw_inconsistent(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1232,7 +1232,7 @@ class NetworkSubnetTests(test.TestCase):
self.assertContains(res, 'Gateway IP and IP version are inconsistent.') self.assertContains(res, 'Gateway IP and IP version are inconsistent.')
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_invalid_nameservers(self): def test_subnet_update_post_invalid_nameservers(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1252,7 +1252,7 @@ class NetworkSubnetTests(test.TestCase):
'dns_nameservers: Invalid IP address ' 'dns_nameservers: Invalid IP address '
'(value=%s)' % dns_nameservers[1]) '(value=%s)' % dns_nameservers[1])
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_invalid_routes_destination_only(self): def test_subnet_update_post_invalid_routes_destination_only(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1274,7 +1274,7 @@ class NetworkSubnetTests(test.TestCase):
'Destination CIDR and nexthop must be specified ' 'Destination CIDR and nexthop must be specified '
'(value=%s)' % host_routes) '(value=%s)' % host_routes)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_invalid_routes_three_entries(self): def test_subnet_update_post_invalid_routes_three_entries(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1296,7 +1296,7 @@ class NetworkSubnetTests(test.TestCase):
'Destination CIDR and nexthop must be specified ' 'Destination CIDR and nexthop must be specified '
'(value=%s)' % host_routes) '(value=%s)' % host_routes)
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_invalid_routes_invalid_destination(self): def test_subnet_update_post_invalid_routes_invalid_destination(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1317,7 +1317,7 @@ class NetworkSubnetTests(test.TestCase):
'host_routes: Invalid IP address ' 'host_routes: Invalid IP address '
'(value=%s)' % host_routes.split(',')[0]) '(value=%s)' % host_routes.split(',')[0])
@test.create_stubs({api.neutron: ('subnet_modify', @test.create_stubs({api.neutron: ('subnet_update',
'subnet_get',)}) 'subnet_get',)})
def test_subnet_update_post_invalid_routes_nexthop_ip_network(self): def test_subnet_update_post_invalid_routes_nexthop_ip_network(self):
subnet = self.subnets.first() subnet = self.subnets.first()
@ -1436,12 +1436,12 @@ class NetworkPortTests(test.TestCase):
self.assertTemplateUsed(res, 'project/networks/ports/update.html') self.assertTemplateUsed(res, 'project/networks/ports/update.html')
@test.create_stubs({api.neutron: ('port_get', @test.create_stubs({api.neutron: ('port_get',
'port_modify')}) 'port_update')})
def test_port_update_post(self): def test_port_update_post(self):
port = self.ports.first() port = self.ports.first()
api.neutron.port_get(IsA(http.HttpRequest), port.id)\ api.neutron.port_get(IsA(http.HttpRequest), port.id)\
.AndReturn(port) .AndReturn(port)
api.neutron.port_modify(IsA(http.HttpRequest), port.id, api.neutron.port_update(IsA(http.HttpRequest), port.id,
name=port.name, name=port.name,
admin_state_up=port.admin_state_up)\ admin_state_up=port.admin_state_up)\
.AndReturn(port) .AndReturn(port)
@ -1460,12 +1460,12 @@ class NetworkPortTests(test.TestCase):
self.assertRedirectsNoFollow(res, redir_url) self.assertRedirectsNoFollow(res, redir_url)
@test.create_stubs({api.neutron: ('port_get', @test.create_stubs({api.neutron: ('port_get',
'port_modify')}) 'port_update')})
def test_port_update_post_exception(self): def test_port_update_post_exception(self):
port = self.ports.first() port = self.ports.first()
api.neutron.port_get(IsA(http.HttpRequest), port.id)\ api.neutron.port_get(IsA(http.HttpRequest), port.id)\
.AndReturn(port) .AndReturn(port)
api.neutron.port_modify(IsA(http.HttpRequest), port.id, api.neutron.port_update(IsA(http.HttpRequest), port.id,
name=port.name, name=port.name,
admin_state_up=port.admin_state_up)\ admin_state_up=port.admin_state_up)\
.AndRaise(self.exceptions.neutron) .AndRaise(self.exceptions.neutron)

12
openstack_dashboard/dashboards/project/vpn/tabs.py
View File

@ -40,7 +40,7 @@ def get_resource_or_fake(request, base_obj, resource, api_module):
""" """
obj_id = getattr(base_obj, '%s_id' % resource) obj_id = getattr(base_obj, '%s_id' % resource)
try: try:
obj_getter = getattr(api_module, '%s_get' % resource) obj_getter = getattr(api_module, '%_list' % resource)
obj = obj_getter(request, obj_id) obj = obj_getter(request, obj_id)
setattr(base_obj, resource, obj) setattr(base_obj, resource, obj)
except Exception: except Exception:
@ -58,7 +58,7 @@ class IPSecSiteConnectionsTab(tabs.TableTab):
def get_ipsecsiteconnectionstable_data(self): def get_ipsecsiteconnectionstable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
ipsecsiteconnections = api.vpn.ipsecsiteconnections_get( ipsecsiteconnections = api.vpn.ipsecsiteconnection_list(
self.tab_group.request, tenant_id=tenant_id) self.tab_group.request, tenant_id=tenant_id)
ipsecsiteconnectionsFormatted = [s.readable(self.tab_group.request) ipsecsiteconnectionsFormatted = [s.readable(self.tab_group.request)
for s in ipsecsiteconnections] for s in ipsecsiteconnections]
@ -78,7 +78,7 @@ class VPNServicesTab(tabs.TableTab):
def get_vpnservicestable_data(self): def get_vpnservicestable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
vpnservices = api.vpn.vpnservices_get( vpnservices = api.vpn.vpnservice_list(
self.tab_group.request, tenant_id=tenant_id) self.tab_group.request, tenant_id=tenant_id)
vpnservicesFormatted = [s.readable(self.tab_group.request) for vpnservicesFormatted = [s.readable(self.tab_group.request) for
s in vpnservices] s in vpnservices]
@ -98,7 +98,7 @@ class IKEPoliciesTab(tabs.TableTab):
def get_ikepoliciestable_data(self): def get_ikepoliciestable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
ikepolicies = api.vpn.ikepolicies_get( ikepolicies = api.vpn.ikepolicy_list(
self.tab_group.request, tenant_id=tenant_id) self.tab_group.request, tenant_id=tenant_id)
except Exception: except Exception:
ikepolicies = [] ikepolicies = []
@ -116,7 +116,7 @@ class IPSecPoliciesTab(tabs.TableTab):
def get_ipsecpoliciestable_data(self): def get_ipsecpoliciestable_data(self):
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
ipsecpolicies = api.vpn.ipsecpolicies_get( ipsecpolicies = api.vpn.ipsecpolicy_list(
self.tab_group.request, tenant_id=tenant_id) self.tab_group.request, tenant_id=tenant_id)
except Exception: except Exception:
ipsecpolicies = [] ipsecpolicies = []
@ -188,7 +188,7 @@ class VPNServiceDetailsTab(tabs.Tab):
msg = _('Unable to retrieve VPN Service details.') msg = _('Unable to retrieve VPN Service details.')
exceptions.handle(request, msg, redirect=self.failure_url) exceptions.handle(request, msg, redirect=self.failure_url)
try: try:
connections = api.vpn.ipsecsiteconnections_get( connections = api.vpn.ipsecsiteconnection_list(
request, vpnservice_id=sid) request, vpnservice_id=sid)
vpnservice.vpnconnections = connections vpnservice.vpnconnections = connections
except Exception: except Exception:

94
openstack_dashboard/dashboards/project/vpn/tests.py
View File

@ -56,7 +56,7 @@ class VPNTests(test.TestCase):
# retrieves vpnservices # retrieves vpnservices
vpnservice1, vpnservice2 = self.vpnservices.list()[:2] vpnservice1, vpnservice2 = self.vpnservices.list()[:2]
api.vpn.vpnservices_get( api.vpn.vpnservice_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.vpnservices.list()) .AndReturn(self.vpnservices.list())
@ -66,7 +66,7 @@ class VPNTests(test.TestCase):
IsA(http.HttpRequest), vpnservice2.id).AndReturn(vpnservice2) IsA(http.HttpRequest), vpnservice2.id).AndReturn(vpnservice2)
# retrieves ikepolicies # retrieves ikepolicies
api.vpn.ikepolicies_get( api.vpn.ikepolicy_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.ikepolicies.list()) .AndReturn(self.ikepolicies.list())
@ -78,7 +78,7 @@ class VPNTests(test.TestCase):
IsA(http.HttpRequest), ikepolicy2.id).AndReturn(ikepolicy2) IsA(http.HttpRequest), ikepolicy2.id).AndReturn(ikepolicy2)
# retrieves ipsecpolicies # retrieves ipsecpolicies
api.vpn.ipsecpolicies_get( api.vpn.ipsecpolicy_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.ipsecpolicies.list()) .AndReturn(self.ipsecpolicies.list())
@ -90,27 +90,27 @@ class VPNTests(test.TestCase):
IsA(http.HttpRequest), ipsecpolicy2.id).AndReturn(ipsecpolicy2) IsA(http.HttpRequest), ipsecpolicy2.id).AndReturn(ipsecpolicy2)
# retrieves ipsecsiteconnections # retrieves ipsecsiteconnections
api.vpn.ipsecsiteconnections_get( api.vpn.ipsecsiteconnection_list(
IsA(http.HttpRequest), tenant_id=self.tenant.id) \ IsA(http.HttpRequest), tenant_id=self.tenant.id) \
.AndReturn(self.ipsecsiteconnections.list()) .AndReturn(self.ipsecsiteconnections.list())
def set_up_expect_with_exception(self): def set_up_expect_with_exception(self):
api.vpn.vpnservices_get( api.vpn.vpnservice_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron) tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
api.vpn.ikepolicies_get( api.vpn.ikepolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron) tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
api.vpn.ipsecpolicies_get( api.vpn.ipsecpolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron) tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
api.vpn.ipsecsiteconnections_get( api.vpn.ipsecsiteconnection_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron) tenant_id=self.tenant.id).AndRaise(self.exceptions.neutron)
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get', 'ikepolicy_get', 'ipsecsiteconnection_list', 'ikepolicy_get',
'ipsecpolicy_get', 'vpnservice_get', 'ipsecpolicy_get', 'vpnservice_get',
'ipsecsiteconnection_get')}) 'ipsecsiteconnection_get')})
def test_index_vpnservices(self): def test_index_vpnservices(self):
@ -126,9 +126,9 @@ class VPNTests(test.TestCase):
self.assertEqual(len(res.context['table'].data), self.assertEqual(len(res.context['table'].data),
len(self.vpnservices.list())) len(self.vpnservices.list()))
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get', 'ikepolicy_get', 'ipsecsiteconnection_list', 'ikepolicy_get',
'ipsecpolicy_get', 'vpnservice_get', 'ipsecpolicy_get', 'vpnservice_get',
'ipsecsiteconnection_get')}) 'ipsecsiteconnection_get')})
def test_index_ikepolicies(self): def test_index_ikepolicies(self):
@ -144,9 +144,9 @@ class VPNTests(test.TestCase):
self.assertEqual(len(res.context['ikepoliciestable_table'].data), self.assertEqual(len(res.context['ikepoliciestable_table'].data),
len(self.ikepolicies.list())) len(self.ikepolicies.list()))
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get', 'ikepolicy_get', 'ipsecsiteconnection_list', 'ikepolicy_get',
'ipsecpolicy_get', 'vpnservice_get', 'ipsecpolicy_get', 'vpnservice_get',
'ipsecsiteconnection_get')}) 'ipsecsiteconnection_get')})
def test_index_ipsecpolicies(self): def test_index_ipsecpolicies(self):
@ -162,9 +162,9 @@ class VPNTests(test.TestCase):
self.assertEqual(len(res.context['ipsecpoliciestable_table'].data), self.assertEqual(len(res.context['ipsecpoliciestable_table'].data),
len(self.ipsecpolicies.list())) len(self.ipsecpolicies.list()))
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get', 'ikepolicy_get', 'ipsecsiteconnection_list', 'ikepolicy_get',
'ipsecpolicy_get', 'vpnservice_get', 'ipsecpolicy_get', 'vpnservice_get',
'ipsecsiteconnection_get')}) 'ipsecsiteconnection_get')})
def test_index_ipsecsiteconnections(self): def test_index_ipsecsiteconnections(self):
@ -182,9 +182,9 @@ class VPNTests(test.TestCase):
len(res.context['ipsecsiteconnectionstable_table'].data), len(res.context['ipsecsiteconnectionstable_table'].data),
len(self.ipsecsiteconnections.list())) len(self.ipsecsiteconnections.list()))
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get')}) 'ipsecsiteconnection_list')})
def test_index_exception_vpnservices(self): def test_index_exception_vpnservices(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -198,9 +198,9 @@ class VPNTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['table'].data), 0) self.assertEqual(len(res.context['table'].data), 0)
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get')}) 'ipsecsiteconnection_list')})
def test_index_exception_ikepolicies(self): def test_index_exception_ikepolicies(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -214,9 +214,9 @@ class VPNTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['table'].data), 0) self.assertEqual(len(res.context['table'].data), 0)
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get')}) 'ipsecsiteconnection_list')})
def test_index_exception_ipsecpolicies(self): def test_index_exception_ipsecpolicies(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -230,9 +230,9 @@ class VPNTests(test.TestCase):
'horizon/common/_detail_table.html') 'horizon/common/_detail_table.html')
self.assertEqual(len(res.context['table'].data), 0) self.assertEqual(len(res.context['table'].data), 0)
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnections_get')}) 'ipsecsiteconnection_list')})
def test_index_exception_ipsecsiteconnections(self): def test_index_exception_ipsecsiteconnections(self):
self.set_up_expect_with_exception() self.set_up_expect_with_exception()
@ -470,24 +470,24 @@ class VPNTests(test.TestCase):
self.assertFormErrors(res, 1) self.assertFormErrors(res, 1)
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get')}) 'vpnservice_list')})
def test_add_ipsecsiteconnection_get(self): def test_add_ipsecsiteconnection_get(self):
ikepolicies = self.ikepolicies.list() ikepolicies = self.ikepolicies.list()
api.vpn.ikepolicies_get( api.vpn.ikepolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(ikepolicies) tenant_id=self.tenant.id).AndReturn(ikepolicies)
ipsecpolicies = self.ipsecpolicies.list() ipsecpolicies = self.ipsecpolicies.list()
api.vpn.ipsecpolicies_get( api.vpn.ipsecpolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(ipsecpolicies) tenant_id=self.tenant.id).AndReturn(ipsecpolicies)
vpnservices = self.vpnservices.list() vpnservices = self.vpnservices.list()
api.vpn.vpnservices_get( api.vpn.vpnservice_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(vpnservices) tenant_id=self.tenant.id).AndReturn(vpnservices)
@ -505,27 +505,27 @@ class VPNTests(test.TestCase):
'addipsecsiteconnectionoptionalaction>', ] 'addipsecsiteconnectionoptionalaction>', ]
self.assertQuerysetEqual(workflow.steps, expected_objs) self.assertQuerysetEqual(workflow.steps, expected_objs)
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnection_create')}) 'ipsecsiteconnection_create')})
def test_add_ipsecsiteconnection_post(self): def test_add_ipsecsiteconnection_post(self):
ipsecsiteconnection = self.ipsecsiteconnections.first() ipsecsiteconnection = self.ipsecsiteconnections.first()
ikepolicies = self.ikepolicies.list() ikepolicies = self.ikepolicies.list()
api.vpn.ikepolicies_get( api.vpn.ikepolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(ikepolicies) tenant_id=self.tenant.id).AndReturn(ikepolicies)
ipsecpolicies = self.ipsecpolicies.list() ipsecpolicies = self.ipsecpolicies.list()
api.vpn.ipsecpolicies_get( api.vpn.ipsecpolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(ipsecpolicies) tenant_id=self.tenant.id).AndReturn(ipsecpolicies)
vpnservices = self.vpnservices.list() vpnservices = self.vpnservices.list()
api.vpn.vpnservices_get( api.vpn.vpnservice_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(vpnservices) tenant_id=self.tenant.id).AndReturn(vpnservices)
@ -571,27 +571,27 @@ class VPNTests(test.TestCase):
self.assertNoFormErrors(res) self.assertNoFormErrors(res)
self.assertRedirectsNoFollow(res, str(self.INDEX_URL)) self.assertRedirectsNoFollow(res, str(self.INDEX_URL))
@test.create_stubs({api.vpn: ('ikepolicies_get', 'ipsecpolicies_get', @test.create_stubs({api.vpn: ('ikepolicy_list', 'ipsecpolicy_list',
'vpnservices_get', 'vpnservice_list',
'ipsecsiteconnection_create')}) 'ipsecsiteconnection_create')})
def test_add_ipsecsiteconnection_post_error(self): def test_add_ipsecsiteconnection_post_error(self):
ipsecsiteconnection = self.ipsecsiteconnections.first() ipsecsiteconnection = self.ipsecsiteconnections.first()
ikepolicies = self.ikepolicies.list() ikepolicies = self.ikepolicies.list()
api.vpn.ikepolicies_get( api.vpn.ikepolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(ikepolicies) tenant_id=self.tenant.id).AndReturn(ikepolicies)
ipsecpolicies = self.ipsecpolicies.list() ipsecpolicies = self.ipsecpolicies.list()
api.vpn.ipsecpolicies_get( api.vpn.ipsecpolicy_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(ipsecpolicies) tenant_id=self.tenant.id).AndReturn(ipsecpolicies)
vpnservices = self.vpnservices.list() vpnservices = self.vpnservices.list()
api.vpn.vpnservices_get( api.vpn.vpnservice_list(
IsA(http.HttpRequest), IsA(http.HttpRequest),
tenant_id=self.tenant.id).AndReturn(vpnservices) tenant_id=self.tenant.id).AndReturn(vpnservices)

8
openstack_dashboard/dashboards/project/vpn/workflows.py
View File

@ -341,7 +341,7 @@ class AddIPSecSiteConnectionAction(workflows.Action):
ikepolicy_id_choices = [('', _("Select IKE Policy"))] ikepolicy_id_choices = [('', _("Select IKE Policy"))]
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
ikepolicies = api.vpn.ikepolicies_get(request, tenant_id=tenant_id) ikepolicies = api.vpn.ikepolicy_list(request, tenant_id=tenant_id)
except Exception: except Exception:
exceptions.handle(request, exceptions.handle(request,
_('Unable to retrieve IKE Policies list.')) _('Unable to retrieve IKE Policies list.'))
@ -355,8 +355,8 @@ class AddIPSecSiteConnectionAction(workflows.Action):
ipsecpolicy_id_choices = [('', _("Select IPSec Policy"))] ipsecpolicy_id_choices = [('', _("Select IPSec Policy"))]
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
ipsecpolicies = api.vpn.ipsecpolicies_get(request, ipsecpolicies = api.vpn.ipsecpolicy_list(request,
tenant_id=tenant_id) tenant_id=tenant_id)
except Exception: except Exception:
exceptions.handle(request, exceptions.handle(request,
_('Unable to retrieve IPSec Policies list.')) _('Unable to retrieve IPSec Policies list.'))
@ -370,7 +370,7 @@ class AddIPSecSiteConnectionAction(workflows.Action):
vpnservice_id_choices = [('', _("Select VPN Service"))] vpnservice_id_choices = [('', _("Select VPN Service"))]
try: try:
tenant_id = self.request.user.tenant_id tenant_id = self.request.user.tenant_id
vpnservices = api.vpn.vpnservices_get(request, tenant_id=tenant_id) vpnservices = api.vpn.vpnservice_list(request, tenant_id=tenant_id)
except Exception: except Exception:
exceptions.handle(request, exceptions.handle(request,
_('Unable to retrieve VPN Services list.')) _('Unable to retrieve VPN Services list.'))

2
openstack_dashboard/dashboards/router/nexus1000v/forms.py
View File

@ -138,7 +138,7 @@ class UpdateNetworkProfile(forms.SelfHandlingForm):
try: try:
LOG.debug('request = %(req)s, params = %(params)s', LOG.debug('request = %(req)s, params = %(params)s',
{'req': request, 'params': data}) {'req': request, 'params': data})
profile = api.neutron.profile_modify(request, profile = api.neutron.profile_update(request,
data['profile_id'], data['profile_id'],
name=data['name'], name=data['name'],
segment_type= segment_type=

12
openstack_dashboard/test/api_tests/fwaas_tests.py
View File

@ -51,7 +51,7 @@ class FwaasApiTests(test.APITestCase):
@test.create_stubs({neutronclient: ('list_firewall_rules', @test.create_stubs({neutronclient: ('list_firewall_rules',
'list_firewall_policies')}) 'list_firewall_policies')})
def test_rules_list(self): def test_rule_list(self):
exp_rules = self.fw_rules.list() exp_rules = self.fw_rules.list()
api_rules = {'firewall_rules': self.api_fw_rules.list()} api_rules = {'firewall_rules': self.api_fw_rules.list()}
api_policies = {'firewall_policies': self.api_fw_policies.list()} api_policies = {'firewall_policies': self.api_fw_policies.list()}
@ -60,7 +60,7 @@ class FwaasApiTests(test.APITestCase):
neutronclient.list_firewall_policies().AndReturn(api_policies) neutronclient.list_firewall_policies().AndReturn(api_policies)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.fwaas.rules_list(self.request) ret_val = api.fwaas.rule_list(self.request)
for (v, d) in zip(ret_val, exp_rules): for (v, d) in zip(ret_val, exp_rules):
self.assertIsInstance(v, api.fwaas.Rule) self.assertIsInstance(v, api.fwaas.Rule)
self.assertEqual(v.name, d.name) self.assertEqual(v.name, d.name)
@ -153,7 +153,7 @@ class FwaasApiTests(test.APITestCase):
@test.create_stubs({neutronclient: ('list_firewall_policies', @test.create_stubs({neutronclient: ('list_firewall_policies',
'list_firewall_rules')}) 'list_firewall_rules')})
def test_policies_list(self): def test_policy_list(self):
exp_policies = self.fw_policies.list() exp_policies = self.fw_policies.list()
policies_dict = {'firewall_policies': self.api_fw_policies.list()} policies_dict = {'firewall_policies': self.api_fw_policies.list()}
rules_dict = {'firewall_rules': self.api_fw_rules.list()} rules_dict = {'firewall_rules': self.api_fw_rules.list()}
@ -162,7 +162,7 @@ class FwaasApiTests(test.APITestCase):
neutronclient.list_firewall_rules().AndReturn(rules_dict) neutronclient.list_firewall_rules().AndReturn(rules_dict)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.fwaas.policies_list(self.request) ret_val = api.fwaas.policy_list(self.request)
for (v, d) in zip(ret_val, exp_policies): for (v, d) in zip(ret_val, exp_policies):
self.assertIsInstance(v, api.fwaas.Policy) self.assertIsInstance(v, api.fwaas.Policy)
self.assertEqual(v.name, d.name) self.assertEqual(v.name, d.name)
@ -308,7 +308,7 @@ class FwaasApiTests(test.APITestCase):
@test.create_stubs({neutronclient: ('list_firewalls', @test.create_stubs({neutronclient: ('list_firewalls',
'list_firewall_policies')}) 'list_firewall_policies')})
def test_firewalls_list(self): def test_firewall_list(self):
exp_firewalls = self.firewalls.list() exp_firewalls = self.firewalls.list()
firewalls_dict = {'firewalls': self.api_firewalls.list()} firewalls_dict = {'firewalls': self.api_firewalls.list()}
policies_dict = {'firewall_policies': self.api_fw_policies.list()} policies_dict = {'firewall_policies': self.api_fw_policies.list()}
@ -317,7 +317,7 @@ class FwaasApiTests(test.APITestCase):
neutronclient.list_firewall_policies().AndReturn(policies_dict) neutronclient.list_firewall_policies().AndReturn(policies_dict)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.fwaas.firewalls_list(self.request) ret_val = api.fwaas.firewall_list(self.request)
for (v, d) in zip(ret_val, exp_firewalls): for (v, d) in zip(ret_val, exp_firewalls):
self.assertIsInstance(v, api.fwaas.Firewall) self.assertIsInstance(v, api.fwaas.Firewall)
self.assertEqual(v.name, d.name) self.assertEqual(v.name, d.name)

16
openstack_dashboard/test/api_tests/lbaas_tests.py
View File

@ -68,7 +68,7 @@ class LbaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.lbaas.Vip) self.assertIsInstance(ret_val, api.lbaas.Vip)
@test.create_stubs({neutronclient: ('list_vips',)}) @test.create_stubs({neutronclient: ('list_vips',)})
def test_vips_get(self): def test_vip_list(self):
vips = {'vips': [{'id': 'abcdef-c3eb-4fee-9763-12de3338041e', vips = {'vips': [{'id': 'abcdef-c3eb-4fee-9763-12de3338041e',
'address': '10.0.0.100', 'address': '10.0.0.100',
'name': 'vip1name', 'name': 'vip1name',
@ -83,7 +83,7 @@ class LbaasApiTests(test.APITestCase):
neutronclient.list_vips().AndReturn(vips) neutronclient.list_vips().AndReturn(vips)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.lbaas.vips_get(self.request) ret_val = api.lbaas.vip_list(self.request)
for v in ret_val: for v in ret_val:
self.assertIsInstance(v, api.lbaas.Vip) self.assertIsInstance(v, api.lbaas.Vip)
@ -164,7 +164,7 @@ class LbaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.lbaas.Pool) self.assertIsInstance(ret_val, api.lbaas.Pool)
@test.create_stubs({neutronclient: ('list_pools',)}) @test.create_stubs({neutronclient: ('list_pools',)})
def test_pools_get(self): def test_pool_list(self):
pools = {'pools': [{ pools = {'pools': [{
'id': 'abcdef-c3eb-4fee-9763-12de3338041e', 'id': 'abcdef-c3eb-4fee-9763-12de3338041e',
'name': 'pool1name', 'name': 'pool1name',
@ -176,7 +176,7 @@ class LbaasApiTests(test.APITestCase):
neutronclient.list_pools().AndReturn(pools) neutronclient.list_pools().AndReturn(pools)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.lbaas.pools_get(self.request) ret_val = api.lbaas.pool_list(self.request)
for v in ret_val: for v in ret_val:
self.assertIsInstance(v, api.lbaas.Pool) self.assertIsInstance(v, api.lbaas.Pool)
@ -246,7 +246,7 @@ class LbaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.lbaas.PoolMonitor) self.assertIsInstance(ret_val, api.lbaas.PoolMonitor)
@test.create_stubs({neutronclient: ('list_health_monitors',)}) @test.create_stubs({neutronclient: ('list_health_monitors',)})
def test_pool_health_monitors_get(self): def test_pool_health_monitor_list(self):
monitors = {'health_monitors': [ monitors = {'health_monitors': [
{'id': 'abcdef-c3eb-4fee-9763-12de3338041e', {'id': 'abcdef-c3eb-4fee-9763-12de3338041e',
'type': 'PING', 'type': 'PING',
@ -261,7 +261,7 @@ class LbaasApiTests(test.APITestCase):
neutronclient.list_health_monitors().AndReturn(monitors) neutronclient.list_health_monitors().AndReturn(monitors)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.lbaas.pool_health_monitors_get(self.request) ret_val = api.lbaas.pool_health_monitor_list(self.request)
for v in ret_val: for v in ret_val:
self.assertIsInstance(v, api.lbaas.PoolMonitor) self.assertIsInstance(v, api.lbaas.PoolMonitor)
@ -309,7 +309,7 @@ class LbaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.lbaas.Member) self.assertIsInstance(ret_val, api.lbaas.Member)
@test.create_stubs({neutronclient: ('list_members',)}) @test.create_stubs({neutronclient: ('list_members',)})
def test_members_get(self): def test_member_list(self):
members = {'members': [ members = {'members': [
{'id': 'abcdef-c3eb-4fee-9763-12de3338041e', {'id': 'abcdef-c3eb-4fee-9763-12de3338041e',
'pool_id': 'abcdef-c3eb-4fee-9763-12de3338041e', 'pool_id': 'abcdef-c3eb-4fee-9763-12de3338041e',
@ -321,7 +321,7 @@ class LbaasApiTests(test.APITestCase):
neutronclient.list_members().AndReturn(members) neutronclient.list_members().AndReturn(members)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.lbaas.members_get(self.request) ret_val = api.lbaas.member_list(self.request)
for v in ret_val: for v in ret_val:
self.assertIsInstance(v, api.lbaas.Member) self.assertIsInstance(v, api.lbaas.Member)

12
openstack_dashboard/test/api_tests/neutron_tests.py
View File

@ -57,7 +57,7 @@ class NeutronApiTests(test.APITestCase):
ret_val = api.neutron.network_create(self.request, name='net1') ret_val = api.neutron.network_create(self.request, name='net1')
self.assertIsInstance(ret_val, api.neutron.Network) self.assertIsInstance(ret_val, api.neutron.Network)
def test_network_modify(self): def test_network_update(self):
network = {'network': self.api_networks.first()} network = {'network': self.api_networks.first()}
network_id = self.api_networks.first()['id'] network_id = self.api_networks.first()['id']
@ -67,7 +67,7 @@ class NeutronApiTests(test.APITestCase):
.AndReturn(network) .AndReturn(network)
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.neutron.network_modify(self.request, network_id, ret_val = api.neutron.network_update(self.request, network_id,
name='net1') name='net1')
self.assertIsInstance(ret_val, api.neutron.Network) self.assertIsInstance(ret_val, api.neutron.Network)
@ -119,7 +119,7 @@ class NeutronApiTests(test.APITestCase):
ret_val = api.neutron.subnet_create(self.request, **params) ret_val = api.neutron.subnet_create(self.request, **params)
self.assertIsInstance(ret_val, api.neutron.Subnet) self.assertIsInstance(ret_val, api.neutron.Subnet)
def test_subnet_modify(self): def test_subnet_update(self):
subnet_data = self.api_subnets.first() subnet_data = self.api_subnets.first()
subnet_id = subnet_data['id'] subnet_id = subnet_data['id']
params = {'name': subnet_data['name'], params = {'name': subnet_data['name'],
@ -130,7 +130,7 @@ class NeutronApiTests(test.APITestCase):
.AndReturn({'subnet': subnet_data}) .AndReturn({'subnet': subnet_data})
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.neutron.subnet_modify(self.request, subnet_id, **params) ret_val = api.neutron.subnet_update(self.request, subnet_id, **params)
self.assertIsInstance(ret_val, api.neutron.Subnet) self.assertIsInstance(ret_val, api.neutron.Subnet)
def test_subnet_delete(self): def test_subnet_delete(self):
@ -180,7 +180,7 @@ class NeutronApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.neutron.Port) self.assertIsInstance(ret_val, api.neutron.Port)
self.assertEqual(ret_val.id, api.neutron.Port(port_data).id) self.assertEqual(ret_val.id, api.neutron.Port(port_data).id)
def test_port_modify(self): def test_port_update(self):
port_data = self.api_ports.first() port_data = self.api_ports.first()
port_id = port_data['id'] port_id = port_data['id']
params = {'name': port_data['name'], params = {'name': port_data['name'],
@ -191,7 +191,7 @@ class NeutronApiTests(test.APITestCase):
.AndReturn({'port': port_data}) .AndReturn({'port': port_data})
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.neutron.port_modify(self.request, port_id, **params) ret_val = api.neutron.port_update(self.request, port_id, **params)
self.assertIsInstance(ret_val, api.neutron.Port) self.assertIsInstance(ret_val, api.neutron.Port)
self.assertEqual(ret_val.id, api.neutron.Port(port_data).id) self.assertEqual(ret_val.id, api.neutron.Port(port_data).id)

16
openstack_dashboard/test/api_tests/vpnaas_tests.py
View File

@ -45,7 +45,7 @@ class VPNaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.vpn.VPNService) self.assertIsInstance(ret_val, api.vpn.VPNService)
@test.create_stubs({neutronclient: ('list_vpnservices',)}) @test.create_stubs({neutronclient: ('list_vpnservices',)})
def test_vpnservices_get(self): def test_vpnservice_list(self):
vpnservices = {'vpnservices': self.vpnservices.list()} vpnservices = {'vpnservices': self.vpnservices.list()}
vpnservices_dict = {'vpnservices': self.api_vpnservices.list()} vpnservices_dict = {'vpnservices': self.api_vpnservices.list()}
@ -53,7 +53,7 @@ class VPNaasApiTests(test.APITestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.vpn.vpnservices_get(self.request) ret_val = api.vpn.vpnservice_list(self.request)
for (v, d) in zip(ret_val, vpnservices['vpnservices']): for (v, d) in zip(ret_val, vpnservices['vpnservices']):
self.assertIsInstance(v, api.vpn.VPNService) self.assertIsInstance(v, api.vpn.VPNService)
self.assertTrue(v.name, d.name) self.assertTrue(v.name, d.name)
@ -96,7 +96,7 @@ class VPNaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.vpn.IKEPolicy) self.assertIsInstance(ret_val, api.vpn.IKEPolicy)
@test.create_stubs({neutronclient: ('list_ikepolicies',)}) @test.create_stubs({neutronclient: ('list_ikepolicies',)})
def test_ikepolicies_get(self): def test_ikepolicy_list(self):
ikepolicies = {'ikepolicies': self.ikepolicies.list()} ikepolicies = {'ikepolicies': self.ikepolicies.list()}
ikepolicies_dict = {'ikepolicies': self.api_ikepolicies.list()} ikepolicies_dict = {'ikepolicies': self.api_ikepolicies.list()}
@ -104,7 +104,7 @@ class VPNaasApiTests(test.APITestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.vpn.ikepolicies_get(self.request) ret_val = api.vpn.ikepolicy_list(self.request)
for (v, d) in zip(ret_val, ikepolicies['ikepolicies']): for (v, d) in zip(ret_val, ikepolicies['ikepolicies']):
self.assertIsInstance(v, api.vpn.IKEPolicy) self.assertIsInstance(v, api.vpn.IKEPolicy)
self.assertTrue(v.name, d.name) self.assertTrue(v.name, d.name)
@ -147,7 +147,7 @@ class VPNaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.vpn.IPSecPolicy) self.assertIsInstance(ret_val, api.vpn.IPSecPolicy)
@test.create_stubs({neutronclient: ('list_ipsecpolicies',)}) @test.create_stubs({neutronclient: ('list_ipsecpolicies',)})
def test_ipsecpolicies_get(self): def test_ipsecpolicy_list(self):
ipsecpolicies = {'ipsecpolicies': self.ipsecpolicies.list()} ipsecpolicies = {'ipsecpolicies': self.ipsecpolicies.list()}
ipsecpolicies_dict = {'ipsecpolicies': self.api_ipsecpolicies.list()} ipsecpolicies_dict = {'ipsecpolicies': self.api_ipsecpolicies.list()}
@ -155,7 +155,7 @@ class VPNaasApiTests(test.APITestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.vpn.ipsecpolicies_get(self.request) ret_val = api.vpn.ipsecpolicy_list(self.request)
for (v, d) in zip(ret_val, ipsecpolicies['ipsecpolicies']): for (v, d) in zip(ret_val, ipsecpolicies['ipsecpolicies']):
self.assertIsInstance(v, api.vpn.IPSecPolicy) self.assertIsInstance(v, api.vpn.IPSecPolicy)
self.assertTrue(v.name, d.name) self.assertTrue(v.name, d.name)
@ -206,7 +206,7 @@ class VPNaasApiTests(test.APITestCase):
self.assertIsInstance(ret_val, api.vpn.IPSecSiteConnection) self.assertIsInstance(ret_val, api.vpn.IPSecSiteConnection)
@test.create_stubs({neutronclient: ('list_ipsec_site_connections',)}) @test.create_stubs({neutronclient: ('list_ipsec_site_connections',)})
def test_ipsecsiteconnections_get(self): def test_ipsecsiteconnection_list(self):
ipsecsiteconnections = { ipsecsiteconnections = {
'ipsec_site_connections': self.ipsecsiteconnections.list()} 'ipsec_site_connections': self.ipsecsiteconnections.list()}
ipsecsiteconnections_dict = { ipsecsiteconnections_dict = {
@ -217,7 +217,7 @@ class VPNaasApiTests(test.APITestCase):
self.mox.ReplayAll() self.mox.ReplayAll()
ret_val = api.vpn.ipsecsiteconnections_get(self.request) ret_val = api.vpn.ipsecsiteconnection_list(self.request)
for (v, d) in zip(ret_val, for (v, d) in zip(ret_val,
ipsecsiteconnections['ipsec_site_connections']): ipsecsiteconnections['ipsec_site_connections']):
self.assertIsInstance(v, api.vpn.IPSecSiteConnection) self.assertIsInstance(v, api.vpn.IPSecSiteConnection)