feat(interlink): support hosted L2 partners & links (#5598)

Co-authored-by: Prototool Bot <prototool-bot@scaleway.com>
Co-authored-by: Estelle Soulard <esoulard@scaleway.com>

Author: 3 people

cmd/scw/testdata/test-all-usage-interlink-link-list-usage.golden

@@ -19,7 +19,7 @@ ARGS:
   [vpc-id]              Filter for links attached to this VPC
   [routing-policy-id]   Filter for links using this routing policy
   [pairing-key]         Filter for the link with this pairing_key
-  [kind]                Filter for hosted or self-hosted links (hosted | self_hosted)
+  [kind]                Filter for hosted or self-hosted links (hosted | self_hosted | l2_hosted | l3_hosted)
   [connection-id]       Filter for links self-hosted on this connection
   [organization-id]     Organization ID to filter for
   [region=fr-par]       Region to target. If none is passed will use default region from the config (fr-par | it-mil | nl-ams | pl-waw | all)

cmd/scw/testdata/test-all-usage-interlink-partner-list-usage.golden

@@ -8,6 +8,7 @@ USAGE:
 ARGS:
   [order-by]          Order in which to return results (name_asc | name_desc)
   [pop-ids.{index}]   Filter for partners present (offering a connection) in one of these PoPs
+  [l3-connectivity]   Filter for partners supporting L3 connectivity
   [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | it-mil | nl-ams | pl-waw | all)
 
 FLAGS:

cmd/scw/testdata/test-all-usage-interlink-pop-list-usage.golden

@@ -6,13 +6,14 @@ USAGE:
   scw interlink pop list [arg=value ...]
 
 ARGS:
-  [order-by]                Order in which to return results (name_asc | name_desc)
-  [name]                    PoP name to filter for
-  [hosting-provider-name]   Hosting provider name to filter for
-  [partner-id]              Filter for PoPs hosting an available shared connection from this partner
-  [link-bandwidth-mbps]     Filter for PoPs with a shared connection allowing this bandwidth size. Note that we cannot guarantee that PoPs returned will have available capacity.
-  [dedicated-available]     Filter for PoPs with a dedicated connection available for self-hosted links.
-  [region=fr-par]           Region to target. If none is passed will use default region from the config (fr-par | it-mil | nl-ams | pl-waw | all)
+  [order-by]                   Order in which to return results (name_asc | name_desc)
+  [name]                       PoP name to filter for
+  [hosting-provider-name]      Hosting provider name to filter for
+  [partner-id]                 Filter for PoPs hosting an available shared connection from this partner
+  [link-bandwidth-mbps]        Filter for PoPs with a connection allowing this bandwidth size. Note that we cannot guarantee that PoPs returned will have available capacity.
+  [dedicated-available]        Filter for PoPs with a dedicated connection available for self-hosted links.
+  [l3-connectivity-partners]   Filter for PoPs with a shared connection available from a partner supporting L3 connectivity
+  [region=fr-par]              Region to target. If none is passed will use default region from the config (fr-par | it-mil | nl-ams | pl-waw | all)
 
 FLAGS:
   -h, --help                help for list

docs/commands/interlink.md

@@ -269,7 +269,7 @@ scw interlink link list [arg=value ...]
 | vpc-id |  | Filter for links attached to this VPC |
 | routing-policy-id |  | Filter for links using this routing policy |
 | pairing-key |  | Filter for the link with this pairing_key |
-| kind | One of: `hosted`, `self_hosted` | Filter for hosted or self-hosted links |
+| kind | One of: `hosted`, `self_hosted`, `l2_hosted`, `l3_hosted` | Filter for hosted or self-hosted links |
 | connection-id |  | Filter for links self-hosted on this connection |
 | organization-id |  | Organization ID to filter for |
 | region | Default: `fr-par`<br />One of: `fr-par`, `it-mil`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
@@ -341,6 +341,7 @@ scw interlink partner list [arg=value ...]
 |------|---|-------------|
 | order-by | One of: `name_asc`, `name_desc` | Order in which to return results |
 | pop-ids.{index} |  | Filter for partners present (offering a connection) in one of these PoPs |
+| l3-connectivity |  | Filter for partners supporting L3 connectivity |
 | region | Default: `fr-par`<br />One of: `fr-par`, `it-mil`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
 
 
@@ -389,8 +390,9 @@ scw interlink pop list [arg=value ...]
 | name |  | PoP name to filter for |
 | hosting-provider-name |  | Hosting provider name to filter for |
 | partner-id |  | Filter for PoPs hosting an available shared connection from this partner |
-| link-bandwidth-mbps |  | Filter for PoPs with a shared connection allowing this bandwidth size. Note that we cannot guarantee that PoPs returned will have available capacity. |
+| link-bandwidth-mbps |  | Filter for PoPs with a connection allowing this bandwidth size. Note that we cannot guarantee that PoPs returned will have available capacity. |
 | dedicated-available |  | Filter for PoPs with a dedicated connection available for self-hosted links. |
+| l3-connectivity-partners |  | Filter for PoPs with a shared connection available from a partner supporting L3 connectivity |
 | region | Default: `fr-par`<br />One of: `fr-par`, `it-mil`, `nl-ams`, `pl-waw`, `all` | Region to target. If none is passed will use default region from the config |
 
 

internal/namespaces/interlink/v1beta1/interlink_cli.go

@@ -129,6 +129,13 @@ func interlinkPartnerList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "l3-connectivity",
+				Short:      `Filter for partners supporting L3 connectivity`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionItMil,
@@ -236,7 +243,7 @@ func interlinkPopList() *core.Command {
 			},
 			{
 				Name:       "link-bandwidth-mbps",
-				Short:      `Filter for PoPs with a shared connection allowing this bandwidth size. Note that we cannot guarantee that PoPs returned will have available capacity.`,
+				Short:      `Filter for PoPs with a connection allowing this bandwidth size. Note that we cannot guarantee that PoPs returned will have available capacity.`,
 				Required:   false,
 				Deprecated: false,
 				Positional: false,
@@ -248,6 +255,13 @@ func interlinkPopList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "l3-connectivity-partners",
+				Short:      `Filter for PoPs with a shared connection available from a partner supporting L3 connectivity`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
 			core.RegionArgSpec(
 				scw.RegionFrPar,
 				scw.RegionItMil,
@@ -457,6 +471,8 @@ func interlinkLinkList() *core.Command {
 				EnumValues: []string{
 					"hosted",
 					"self_hosted",
+					"l2_hosted",
+					"l3_hosted",
 				},
 			},
 			{