Skip to content
Snippets Groups Projects
Commit e9651024 authored by JORGE SASIAIN's avatar JORGE SASIAIN
Browse files

Finish merge develop into NAT-185

parent eea085fb
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 10 deletions
test/test_ipam.py
+ 5
− 10
View file @ e9651024
...@@ -44,22 +44,19 @@ def test_new_service_host(data_config_filename): ...@@ -44,22 +44,19 @@ def test_new_service_host(data_config_filename):
responses.add( responses.add(
method=responses.POST, method=responses.POST,
url=re.compile(r'.*/wapi.*/record:host$'), url=re.compile(r'.*/wapi.*/record:host$'),
json='record:host/ZG5zLmhvc3QkLm5vbl9ETlNfaG9zdF9yb290LjAuMTY4MzcwNTU4' json='record:host/ZG5zLmhvc3QkLm5vbl9ETlNfaG9zdF9yb290LjAuMTY4MzcwNTU4MzY3MC5nc28udGVzdA:test.lo/%20' # noqa: E501
'MzY3MC5nc28udGVzdA:test.lo/%20' # noqa: E501
) )
responses.add( responses.add(
method=responses.POST, method=responses.POST,
url=re.compile(r'.*/wapi.*/record:a$'), url=re.compile(r'.*/wapi.*/record:a$'),
json='record:a/ZG5zLmJpbmRfYSQuX2RlZmF1bHQuZ3NvLHRlc3QsMTAuMjU1LjI1NS4' json='record:a/ZG5zLmJpbmRfYSQuX2RlZmF1bHQuZ3NvLHRlc3QsMTAuMjU1LjI1NS44:test.lo/default' # noqa: E501
'4:test.lo/default' # noqa: E501
) )
responses.add( responses.add(
method=responses.POST, method=responses.POST,
url=re.compile(r'.*/wapi.*/record:aaaa$'), url=re.compile(r'.*/wapi.*/record:aaaa$'),
json='record:aaaa/ZG5zLmJpbmRfYSQuX2RlZmF1bHQuZ3NvLHRlc3QsMTAuMjU1LjI1' json='record:aaaa/ZG5zLmJpbmRfYSQuX2RlZmF1bHQuZ3NvLHRlc3QsMTAuMjU1LjI1NS44:test.lo/default' # noqa: E501
'NS44:test.lo/default' # noqa: E501
) )
responses.add( responses.add(
...@@ -67,8 +64,7 @@ def test_new_service_host(data_config_filename): ...@@ -67,8 +64,7 @@ def test_new_service_host(data_config_filename):
url=re.compile(r'.*/wapi.*/network.*10.255.255.*'), url=re.compile(r'.*/wapi.*/network.*10.255.255.*'),
json=[ json=[
{ {
"_ref": "network/ZG5zLm5ldHdvcmskMTAuMjU1LjI1NS4yMC8zMi8w:10.2" "_ref": "network/ZG5zLm5ldHdvcmskMTAuMjU1LjI1NS4yMC8zMi8w:10.255.255.20/32/default", # noqa: E501
"55.255.20/32/default", # noqa: E501
"network": "10.255.255.20/32", "network": "10.255.255.20/32",
"network_view": "default" "network_view": "default"
} }
...@@ -92,8 +88,7 @@ def test_new_service_host(data_config_filename): ...@@ -92,8 +88,7 @@ def test_new_service_host(data_config_filename):
url=re.compile(r'.*/wapi.*/ipv6network.*dead.*beef.*'), url=re.compile(r'.*/wapi.*/ipv6network.*dead.*beef.*'),
json=[ json=[
{ {
"_ref": "ipv6network/ZG5zLm5ldHdvcmskZGVhZDpiZWVmOjoxOC8xMjgvM" "_ref": "ipv6network/ZG5zLm5ldHdvcmskZGVhZDpiZWVmOjoxOC8xMjgvMA:dead%3Abeef%3A%3A18/128/default", # noqa: E501
"A:dead%3Abeef%3A%3A18/128/default", # noqa: E501
"network": "dead:beef::18/128", "network": "dead:beef::18/128",
"network_view": "default" "network_view": "default"
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment