Fix typos related to IPv6 use-cases

Change-Id: I8ede289ded70d2820a39c13a4cbfdaae570f699c

diff --git a/neutron/db/securitygroups_rpc_base.py b/neutron/db/securitygroups_rpc_base.py
index c47493599e165f494bd7742d40a3c8763af6e2fc..3bc630bd580915d9725b5b08bb29d33384d27f9b 100644 (file)
--- a/neutron/db/securitygroups_rpc_base.py
+++ b/neutron/db/securitygroups_rpc_base.py
@@ -321,8 +321,8 @@ class SecurityGroupServerRpcMixin(sg_db.SecurityGroupDbMixin):
     def _select_ra_ips_for_network_ids(self, context, network_ids):
         """Select IP addresses to allow sending router advertisement from.
 
-        If OpenStack dnsmasq sends RA, get link local address of
-        gateway and allow RA from this Link Local address.
+        If the OpenStack managed radvd process sends an RA, get link local
+        address of gateway and allow RA from this Link Local address.
         The gateway port link local address will only be obtained
         when router is created before VM instance is booted and
         subnet is attached to router.

diff --git a/neutron/tests/api/test_dhcp_ipv6.py b/neutron/tests/api/test_dhcp_ipv6.py
index 5323ed704f1b4680588c428fac52eb8f3c8db823..389970d8ad1b9c44d4ef684ab0f41c9efe0a4761 100644 (file)
--- a/neutron/tests/api/test_dhcp_ipv6.py
+++ b/neutron/tests/api/test_dhcp_ipv6.py
@@ -97,9 +97,9 @@ class NetworksTestDHCPv6(base.BaseNetworkTest):
 
     @test.idempotent_id('e5517e62-6f16-430d-a672-f80875493d4c')
     def test_dhcpv6_stateless_eui64(self):
-        """When subnets configured with RAs SLAAC (AOM=100) and DHCP stateless
-        (AOM=110) both for radvd and dnsmasq, port shall receive IP address
-        calculated from its MAC.
+        """When subnets configured with IPv6 SLAAC (AOM=100) and DHCPv6
+        stateless (AOM=110) both for radvd and dnsmasq, port shall receive IP
+        address calculated from its MAC.
         """
         for ra_mode, add_mode in (
                 ('slaac', 'slaac'),
@@ -116,7 +116,7 @@ class NetworksTestDHCPv6(base.BaseNetworkTest):
 
     @test.idempotent_id('ae2f4a5d-03ff-4c42-a3b0-ce2fcb7ea832')
     def test_dhcpv6_stateless_no_ra(self):
-        """When subnets configured with dnsmasq SLAAC and DHCP stateless
+        """When subnets configured with IPv6 SLAAC and DHCPv6 stateless
         and there is no radvd, port shall receive IP address calculated
         from its MAC and mask of subnet.
         """
@@ -169,9 +169,9 @@ class NetworksTestDHCPv6(base.BaseNetworkTest):
 
     @test.idempotent_id('4544adf7-bb5f-4bdc-b769-b3e77026cef2')
     def test_dhcpv6_two_subnets(self):
-        """When one IPv6 subnet configured with dnsmasq SLAAC or DHCP stateless
-        and other IPv6 is with DHCP stateful, port shall receive EUI-64 IP
-        addresses from first subnet and DHCP address from second one.
+        """When one IPv6 subnet configured with IPv6 SLAAC or DHCPv6 stateless
+        and other IPv6 is with DHCPv6 stateful, port shall receive EUI-64 IP
+        addresses from first subnet and DHCPv6 address from second one.
         Order of subnet creating should be unimportant.
         """
         for order in ("slaac_first", "dhcp_first"):
@@ -223,10 +223,13 @@ class NetworksTestDHCPv6(base.BaseNetworkTest):
 
     @test.idempotent_id('4256c61d-c538-41ea-9147-3c450c36669e')
     def test_dhcpv6_64_subnets(self):
-        """When one IPv6 subnet configured with dnsmasq SLAAC or DHCP stateless
-        and other IPv4 is with DHCP of IPv4, port shall receive EUI-64 IP
-        addresses from first subnet and IPv4 DHCP address from second one.
-        Order of subnet creating should be unimportant.
+        """When a Network contains two subnets, one being an IPv6 subnet
+        configured with ipv6_ra_mode either as slaac or dhcpv6-stateless,
+        and the other subnet being an IPv4 subnet, a port attached to the
+        network shall recieve IP addresses from the subnets as follows: An
+        IPv6 address calculated using EUI-64 from the first subnet, and an
+        IPv4 address from the second subnet. The ordering of the subnets
+        that the port is associated with should not affect this behavior.
         """
         for order in ("slaac_first", "dhcp_first"):
             for ra_mode, add_mode in (
@@ -301,7 +304,7 @@ class NetworksTestDHCPv6(base.BaseNetworkTest):
     def test_dhcp_stateful_fixedips(self):
         """With all options below, port shall be able to get
         requested IP from fixed IP range not depending on
-        DHCP stateful (not SLAAC!) settings configured.
+        DHCPv6 stateful (not SLAAC!) settings configured.
         """
         for ra_mode, add_mode in (
                 ('dhcpv6-stateful', 'dhcpv6-stateful'),