Fix #543 - Include prefix ranges in route-set expansion

Author: mxsasha

irrd/server/query_resolver.py

@@ -211,7 +211,7 @@ def _recursive_set_resolve(self, members: Set[str], sets_seen=None, root_source:
         for sub_member in sub_members:
             if self._current_set_root_object_class is None or self._current_set_root_object_class == 'route-set':
                 try:
-                    IP(sub_member)
+                    IP(sub_member.split('^')[0])
                     set_members.add(sub_member)
                     continue
                 except ValueError:

irrd/server/tests/test_query_resolver.py

@@ -450,7 +450,9 @@ def test_route_set_members(self, prepare_resolver):
                 'pk': uuid.uuid4(),
                 'rpsl_pk': 'RS-SECONDLEVEL',
                 'parsed_data': {'as-set': 'RS-SECONDLEVEL',
-                                'members': ['AS-REFERRED', '192.0.2.0/25']},
+                                'members': [
+                                    'AS-REFERRED', '192.0.2.0/25', '192.0.2.0/26^32'
+                                ]},
                 'object_text': 'text',
                 'object_class': 'route-set',
                 'source': 'TEST1',
@@ -472,7 +474,7 @@ def test_route_set_members(self, prepare_resolver):
         mock_preloader.routes_for_origins = Mock(return_value=['192.0.2.128/25'])
 
         result = resolver.members_for_set('RS-FIRSTLEVEL', recursive=True)
-        assert result == ['192.0.2.0/25', '192.0.2.128/25']
+        assert set(result) == {'192.0.2.0/26^32', '192.0.2.0/25', '192.0.2.128/25'}
         assert flatten_mock_calls(mock_dq) == [
             ['object_classes', (['as-set', 'route-set'],), {}],
             ['rpsl_pks', ({'RS-FIRSTLEVEL'},), {}],