Skip to content

Fixed IP Blocks IT #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdsalvy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed IP Blocks IT #244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions tests/integration/modules/test_nsxt_ip_blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
from saltext.vmware.utils import common
from saltext.vmware.utils import nsxt_request

BASE_URL = "https://{}/api/v1/pools/ip-blocks"
BASE_URL = "https://{}/api/v1/pools/ip-blocks/"


@pytest.fixture(autouse=True)
def setup(nsxt_config):
hostname, username, password, cert = _get_server_info(nsxt_config)
ip_block_from_nsxt = _get_ip_block_by_display_name_using_nsxt_api(
ip_blocks_from_nsxt = _get_ip_block_by_display_name_using_nsxt_api(
hostname, username, password, "IP_Block_Salt_FT"
)

for ip_block in ip_block_from_nsxt:
url = urljoin(BASE_URL, "/{}").format(hostname, ip_block["id"])
for ip_block in ip_blocks_from_nsxt:
url = urljoin(BASE_URL, "{}").format(hostname, ip_block["id"])
requests.delete(url=url, auth=HTTPBasicAuth(username, password), verify=cert)


Expand All @@ -41,7 +41,6 @@ def _delete_ip_block(hostname, password, salt_call_cli, updated_ip_block_json, u
password=password,
verify_ssl=False,
ip_block_id=updated_ip_block_json["id"],
**updated_ip_block_json
).json


Expand All @@ -54,7 +53,10 @@ def _update_ip_block(created_ip_block_json, hostname, password, salt_call_cli, u
revision=created_ip_block_json["_revision"],
ip_block_id=created_ip_block_json["id"],
verify_ssl=False,
**created_ip_block_json
display_name=created_ip_block_json.get("display_name"),
cidr=created_ip_block_json.get("cidr"),
description=created_ip_block_json.get("description"),
tags=created_ip_block_json.get("tags"),
).json


Expand Down Expand Up @@ -112,9 +114,8 @@ def _get_ip_block_by_display_name_using_nsxt_api(hostname, username, password, d
return response


@pytest.mark.xfail(reason="nsxt tests not working yet")
def test_nsxt_ip_blocks_execution_module_crud_operations(nsxt_config, salt_call_cli):
hostname, username, password = _get_server_info(nsxt_config)
hostname, username, password, cert = _get_server_info(nsxt_config)

request_data = {
"display_name": "IP_Block_Salt_FT",
Expand Down Expand Up @@ -148,12 +149,10 @@ def test_nsxt_ip_blocks_execution_module_crud_operations(nsxt_config, salt_call_
)[0]

assert ip_block_from_nsxt == updated_ip_block_json

assert (
_delete_ip_block(hostname, password, salt_call_cli, updated_ip_block_json, username)
== "IP Block deleted successfully"
)

assert (
len(
_get_ip_block_by_display_name_using_nsxt_api(hostname, username, password, display_name)
Expand Down