Instance /network-interfaces -> /networking (#2291)

instance /networking-interfaces -> /networking

Author: david-crespo

app/pages/project/instances/instance/InstancePage.tsx

@@ -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>
     </>

app/routes.tsx

@@ -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' }}

app/util/path-builder.spec.ts

@@ -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",
@@ -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",

app/util/path-builder.ts

@@ -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`,

test/e2e/instance-networking.e2e.ts

@@ -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' })
@@ -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' })
 

test/e2e/network-interface-create.e2e.ts

@@ -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)
 
@@ -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)
 

test/e2e/z-index.e2e.ts

@@ -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)