Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions oks_cli/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,4 +391,22 @@ def project_get_public_ips(ctx, project_name, output, profile):
project_id = find_project_id_by_name(project_name)

data = do_request("GET", f'projects/{project_id}/public_ips')
print_output(data, output)



# GET NETS BY PROJECT NAME
@project.command('nets', help="Get project nets")
@click.option('--project-name', '-p', help="Name of the project", shell_complete=project_completer)
@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format, by default is json")
@click.option('--profile',help="Configuration profile to use")
@click.pass_context
def project_get_public_ips(ctx, project_name, output, profile):
"""Retrieve the list of Nets associated with the specified project."""
project_name, _, profile = ctx_update(ctx, project_name, None, profile)
login_profile(profile)

project_id = find_project_id_by_name(project_name)

data = do_request("GET", f'projects/{project_id}/nets')
print_output(data, output)
2 changes: 2 additions & 0 deletions oks_cli/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ def find_response_object(data):
return response["PublicIps"]
elif key == "IP":
return response["IP"]
elif key == "Nets":
return response["Nets"]

raise click.ClickException("The API response format is incorrect.")

Expand Down
74 changes: 74 additions & 0 deletions tests/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,80 @@ def test_project_publicips_yaml(mock_request, add_default_profile):
# END PROJECT PUBLICIPS COMMAND


# START PROJECT NETS COMMAND
# Test the "project nets" command: verifies fetching project nets
nets = [{
"DhcpOptionsSetId": "dopt-12345678",
"IpRange": "10.50.0.0/16",
"NetId": "vpc-12345678",
"State": "available",
"Tags": [
{
"Key": "Name",
"Value": "default"
}
]
}]

@patch("oks_cli.utils.requests.request")
def test_project_nets_command(mock_request, add_default_profile):
mock_request.side_effect = [
MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Nets": nets })
]

runner = CliRunner()
result = runner.invoke(cli, ["project", "nets", "-p", "test"])
assert result.exit_code == 0

data = json.loads(result.output)
assert isinstance(data, list)
assert data == nets

@patch("oks_cli.utils.requests.request")
def test_project_nets_json(mock_request, add_default_profile):
mock_request.side_effect = [
MagicMock(status_code=200, headers={}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Nets": nets })
]

runner = CliRunner()
result = runner.invoke(cli, [
"project", "nets",
"-p", "test-project",
"-o", "json",
"--profile", "default"
])

assert result.exit_code == 0

data = json.loads(result.output)
assert isinstance(data, list)
assert data == nets

@patch("oks_cli.utils.requests.request")
def test_project_nets_yaml(mock_request, add_default_profile):
mock_request.side_effect = [
MagicMock(status_code=200, headers={}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
MagicMock(status_code=200, headers = {}, json=lambda: {"ResponseContext": {}, "Nets": nets })
]

runner = CliRunner()
result = runner.invoke(cli, [
"project", "nets",
"-p", "test-project",
"-o", "yaml",
"--profile", "default"
])

assert result.exit_code == 0

data = yaml.safe_load(result.output)
assert isinstance(data, list)
assert data == nets
# END PROJECT NETS COMMAND


# Test the "project list" command with --watch option
@patch("oks_cli.utils.requests.request")
@patch("time.sleep")
Expand Down