floatingipspage.py (horizon-18.6.2) | : | floatingipspage.py (horizon-18.6.3) | ||
---|---|---|---|---|
skipping to change at line 27 | skipping to change at line 27 | |||
from selenium.webdriver.common import by | from selenium.webdriver.common import by | |||
from openstack_dashboard.test.integration_tests.pages import basepage | from openstack_dashboard.test.integration_tests.pages import basepage | |||
from openstack_dashboard.test.integration_tests.regions import forms | from openstack_dashboard.test.integration_tests.regions import forms | |||
from openstack_dashboard.test.integration_tests.regions import tables | from openstack_dashboard.test.integration_tests.regions import tables | |||
class FloatingIPTable(tables.TableRegion): | class FloatingIPTable(tables.TableRegion): | |||
name = 'floating_ips' | name = 'floating_ips' | |||
FLOATING_IP_ASSOCIATIONS = ( | FLOATING_IP_ASSOCIATIONS = ( | |||
("ip_id", "instance_id")) | ("ip_id", "port_id")) | |||
@tables.bind_table_action('allocate') | @tables.bind_table_action('allocate') | |||
def allocate_ip(self, allocate_button): | def allocate_ip(self, allocate_button): | |||
allocate_button.click() | allocate_button.click() | |||
self.wait_till_spinner_disappears() | self.wait_till_spinner_disappears() | |||
return forms.BaseFormRegion(self.driver, self.conf) | return forms.BaseFormRegion(self.driver, self.conf) | |||
@tables.bind_table_action('release') | @tables.bind_table_action('release') | |||
def release_ip(self, release_button): | def release_ip(self, release_button): | |||
release_button.click() | release_button.click() | |||
skipping to change at line 94 | skipping to change at line 94 | |||
modal_confirmation_form = self.floatingips_table.release_ip() | modal_confirmation_form = self.floatingips_table.release_ip() | |||
modal_confirmation_form.submit() | modal_confirmation_form.submit() | |||
def is_floatingip_present(self, floatingip): | def is_floatingip_present(self, floatingip): | |||
return bool(self._get_row_with_floatingip(floatingip)) | return bool(self._get_row_with_floatingip(floatingip)) | |||
def associate_floatingip(self, floatingip, instance_name=None, | def associate_floatingip(self, floatingip, instance_name=None, | |||
instance_ip=None): | instance_ip=None): | |||
row = self._get_row_with_floatingip(floatingip) | row = self._get_row_with_floatingip(floatingip) | |||
floatingip_form = self.floatingips_table.associate_ip(row) | floatingip_form = self.floatingips_table.associate_ip(row) | |||
floatingip_form.instance_id.text = "{}: {}".format(instance_name, | floatingip_form.port_id.text = "{}: {}".format(instance_name, | |||
instance_ip) | instance_ip) | |||
floatingip_form.submit() | floatingip_form.submit() | |||
def disassociate_floatingip(self, floatingip): | def disassociate_floatingip(self, floatingip): | |||
row = self._get_row_with_floatingip(floatingip) | row = self._get_row_with_floatingip(floatingip) | |||
floatingip_form = self.floatingips_table.disassociate_ip(row) | floatingip_form = self.floatingips_table.disassociate_ip(row) | |||
floatingip_form.submit() | floatingip_form.submit() | |||
def get_fixed_ip(self, floatingip): | def get_fixed_ip(self, floatingip): | |||
row = self._get_row_with_floatingip(floatingip) | row = self._get_row_with_floatingip(floatingip) | |||
return row.cells[self.FLOATING_IPS_TABLE_FIXED_IP_COLUMN].text | return row.cells[self.FLOATING_IPS_TABLE_FIXED_IP_COLUMN].text | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |