Skip to content

Instance /network-interfaces -> /networking #2291

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

Merged
david-crespo merged 1 commit into from
Jun 27, 2024
Merged

Instance /network-interfaces -> /networking #2291

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion app/pages/project/instances/instance/InstancePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export function InstancePage() {
<RouteTabs fullWidth>
<Tab to={pb.instanceStorage(instanceSelector)}>Storage</Tab>
<Tab to={pb.instanceMetrics(instanceSelector)}>Metrics</Tab>
<Tab to={pb.nics(instanceSelector)}>Networking</Tab>
<Tab to={pb.instanceNetworking(instanceSelector)}>Networking</Tab>
<Tab to={pb.instanceConnect(instanceSelector)}>Connect</Tab>
</RouteTabs>
</>
Expand Down
2 changes: 1 addition & 1 deletion app/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ export const routes = createRoutesFromElements(
handle={{ crumb: 'Storage' }}
/>
<Route
path="network-interfaces"
path="networking"
element={<NetworkingTab />}
loader={NetworkingTab.loader}
handle={{ crumb: 'Networking' }}
Expand Down
2 changes: 1 addition & 1 deletion app/util/path-builder.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ test('path builder', () => {
"instance": "/projects/p/instances/i/storage",
"instanceConnect": "/projects/p/instances/i/connect",
"instanceMetrics": "/projects/p/instances/i/metrics",
"instanceNetworking": "/projects/p/instances/i/networking",
"instanceStorage": "/projects/p/instances/i/storage",
"instances": "/projects/p/instances",
"instancesNew": "/projects/p/instances-new",
Expand All @@ -50,7 +51,6 @@ test('path builder', () => {
"ipPoolRangeAdd": "/system/networking/ip-pools/pl/ranges-add",
"ipPools": "/system/networking/ip-pools",
"ipPoolsNew": "/system/networking/ip-pools-new",
"nics": "/projects/p/instances/i/network-interfaces",
"profile": "/settings/profile",
"project": "/projects/p/instances",
"projectAccess": "/projects/p/access",
Expand Down
4 changes: 1 addition & 3 deletions app/util/path-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ export const pb = {
instanceMetrics: (params: Instance) => `${instanceBase(params)}/metrics`,
instanceStorage: (params: Instance) => `${instanceBase(params)}/storage`,
instanceConnect: (params: Instance) => `${instanceBase(params)}/connect`,

nics: (params: Instance) => `${instanceBase(params)}/network-interfaces`,

instanceNetworking: (params: Instance) => `${instanceBase(params)}/networking`,
serialConsole: (params: Instance) => `${instanceBase(params)}/serial-console`,

disksNew: (params: Project) => `${projectBase(params)}/disks-new`,
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/instance-networking.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ test('Instance networking tab — NIC table', async ({ page }) => {
})

test('Instance networking tab — Detach / Attach Ephemeral IPs', async ({ page }) => {
await page.goto('/projects/mock-project/instances/db1/network-interfaces')
await page.goto('/projects/mock-project/instances/db1/networking')

const attachEphemeralIpButton = page.getByRole('button', { name: 'Attach ephemeral IP' })
const externalIpTable = page.getByRole('table', { name: 'External IPs' })
Expand Down Expand Up @@ -114,7 +114,7 @@ test('Instance networking tab — Detach / Attach Ephemeral IPs', async ({ page
})

test('Instance networking tab — floating IPs', async ({ page }) => {
await page.goto('/projects/mock-project/instances/db1/network-interfaces')
await page.goto('/projects/mock-project/instances/db1/networking')
const externalIpTable = page.getByRole('table', { name: 'External IPs' })
const attachFloatingIpButton = page.getByRole('button', { name: 'Attach floating IP' })

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/network-interface-create.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { expect, expectRowVisible, stopInstance } from './utils'

test('can create a NIC with a specified IP address', async ({ page }) => {
// go to an instance’s Network Interfaces page
await page.goto('/projects/mock-project/instances/db1/network-interfaces')
await page.goto('/projects/mock-project/instances/db1/networking')

await stopInstance(page)

Expand All @@ -38,7 +38,7 @@ test('can create a NIC with a specified IP address', async ({ page }) => {

test('can create a NIC with a blank IP address', async ({ page }) => {
// go to an instance’s Network Interfaces page
await page.goto('/projects/mock-project/instances/db1/network-interfaces')
await page.goto('/projects/mock-project/instances/db1/networking')

await stopInstance(page)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/z-index.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test('Dropdown content can scroll off page and doesn’t hide TopBar', async ({

test('Dropdown content in SidebarModal shows on screen', async ({ page }) => {
// go to an instance’s Network Interfaces page
await page.goto('/projects/mock-project/instances/db1/network-interfaces')
await page.goto('/projects/mock-project/instances/db1/networking')

await stopInstance(page)

Expand Down