Skip to content

Commit 748ab35

Browse files
yoshi-automationsofisl
yoshi-automation
authored and
sofisl
committed
feat(networkconnectivity): update the API
#### networkconnectivity:v1alpha1 The following keys were changed: - schemas.InternalRange.properties.ipCidrRange.description - schemas.InternalRange.properties.prefixLength.description #### networkconnectivity:v1 The following keys were added: - schemas.ConsumerPscConfig.properties.producerInstanceId.deprecated - schemas.ConsumerPscConfig.properties.producerInstanceMetadata.additionalProperties.type - schemas.ConsumerPscConfig.properties.producerInstanceMetadata.description - schemas.ConsumerPscConfig.properties.producerInstanceMetadata.type - schemas.ConsumerPscConnection.properties.errorType.deprecated - schemas.ConsumerPscConnection.properties.producerInstanceId.deprecated - schemas.ConsumerPscConnection.properties.producerInstanceMetadata.additionalProperties.type - schemas.ConsumerPscConnection.properties.producerInstanceMetadata.description - schemas.ConsumerPscConnection.properties.producerInstanceMetadata.type - schemas.InternalRange.properties.migration.$ref - schemas.InternalRange.properties.migration.description - schemas.LinkedProducerVpcNetwork.description - schemas.LinkedProducerVpcNetwork.id - schemas.LinkedProducerVpcNetwork.properties.excludeExportRanges.description - schemas.LinkedProducerVpcNetwork.properties.excludeExportRanges.items.type - schemas.LinkedProducerVpcNetwork.properties.excludeExportRanges.type - schemas.LinkedProducerVpcNetwork.properties.network.description - schemas.LinkedProducerVpcNetwork.properties.network.type - schemas.LinkedProducerVpcNetwork.properties.peering.description - schemas.LinkedProducerVpcNetwork.properties.peering.type - schemas.LinkedProducerVpcNetwork.properties.producerNetwork.description - schemas.LinkedProducerVpcNetwork.properties.producerNetwork.readOnly - schemas.LinkedProducerVpcNetwork.properties.producerNetwork.type - schemas.LinkedProducerVpcNetwork.properties.serviceConsumerVpcSpoke.description - schemas.LinkedProducerVpcNetwork.properties.serviceConsumerVpcSpoke.readOnly - schemas.LinkedProducerVpcNetwork.properties.serviceConsumerVpcSpoke.type - schemas.LinkedProducerVpcNetwork.type - schemas.Migration.description - schemas.Migration.id - schemas.Migration.properties.source.description - schemas.Migration.properties.source.type - schemas.Migration.properties.target.description - schemas.Migration.properties.target.type - schemas.Migration.type - schemas.PscConnection.properties.errorType.deprecated - schemas.PscConnection.properties.producerInstanceId.deprecated - schemas.PscConnection.properties.producerInstanceMetadata.additionalProperties.type - schemas.PscConnection.properties.producerInstanceMetadata.description - schemas.PscConnection.properties.producerInstanceMetadata.type - schemas.PscConnection.properties.serviceClass.description - schemas.PscConnection.properties.serviceClass.readOnly - schemas.PscConnection.properties.serviceClass.type - schemas.Spoke.properties.linkedProducerVpcNetwork.$ref - schemas.Spoke.properties.linkedProducerVpcNetwork.description The following keys were changed: - schemas.ConsumerPscConfig.properties.producerInstanceId.description - schemas.ConsumerPscConnection.properties.producerInstanceId.description - schemas.ConsumerPscConnection.properties.state.enumDescriptions - schemas.InternalRange.properties.ipCidrRange.description - schemas.InternalRange.properties.prefixLength.description - schemas.InternalRange.properties.usage.enum - schemas.InternalRange.properties.usage.enumDescriptions - schemas.LinkedInterconnectAttachments.properties.includeImportRanges.description - schemas.LinkedRouterApplianceInstances.properties.includeImportRanges.description - schemas.LinkedVpnTunnels.properties.includeImportRanges.description - schemas.PscConnection.properties.error.description - schemas.PscConnection.properties.producerInstanceId.description - schemas.PscConnection.properties.state.enumDescriptions - schemas.ServiceConnectionPolicy.properties.createTime.description - schemas.ServiceConnectionPolicy.properties.updateTime.description - schemas.Spoke.properties.spokeType.enum - schemas.Spoke.properties.spokeType.enumDescriptions - schemas.SpokeTypeCount.properties.spokeType.enum - schemas.SpokeTypeCount.properties.spokeType.enumDescriptions
1 parent ccafbfe commit 748ab35

File tree

4 files changed

+190
-36
lines changed

4 files changed

+190
-36
lines changed

‎discovery/networkconnectivity-v1.json

Lines changed: 112 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2812,7 +2812,7 @@
28122812
}
28132813
}
28142814
},
2815-
"revision": "20240807",
2815+
"revision": "20240923",
28162816
"rootUrl": "https://networkconnectivity.googleapis.com/",
28172817
"schemas": {
28182818
"AcceptHubSpokeRequest": {
@@ -2942,9 +2942,17 @@
29422942
"type": "string"
29432943
},
29442944
"producerInstanceId": {
2945-
"description": "Immutable. An immutable identifier for the producer instance.",
2945+
"deprecated": true,
2946+
"description": "Immutable. Deprecated. Use producer_instance_metadata instead. An immutable identifier for the producer instance.",
29462947
"type": "string"
29472948
},
2949+
"producerInstanceMetadata": {
2950+
"additionalProperties": {
2951+
"type": "string"
2952+
},
2953+
"description": "Immutable. An immutable map for the producer instance metadata.",
2954+
"type": "object"
2955+
},
29482956
"project": {
29492957
"description": "The consumer project where PSC connections are allowed to be created in.",
29502958
"type": "string"
@@ -2994,6 +3002,7 @@
29943002
"readOnly": true
29953003
},
29963004
"errorType": {
3005+
"deprecated": true,
29973006
"description": "The error type indicates whether the error is consumer facing, producer facing or system internal.",
29983007
"enum": [
29993008
"CONNECTION_ERROR_TYPE_UNSPECIFIED",
@@ -3026,9 +3035,17 @@
30263035
"type": "string"
30273036
},
30283037
"producerInstanceId": {
3029-
"description": "Immutable. An immutable identifier for the producer instance.",
3038+
"deprecated": true,
3039+
"description": "Immutable. Deprecated. Use producer_instance_metadata instead. An immutable identifier for the producer instance.",
30303040
"type": "string"
30313041
},
3042+
"producerInstanceMetadata": {
3043+
"additionalProperties": {
3044+
"type": "string"
3045+
},
3046+
"description": "Immutable. An immutable map for the producer instance metadata.",
3047+
"type": "object"
3048+
},
30323049
"project": {
30333050
"description": "The consumer project whose PSC forwarding rule is connected to the service attachments in this service connection map.",
30343051
"type": "string"
@@ -3057,7 +3074,7 @@
30573074
],
30583075
"enumDescriptions": [
30593076
"An invalid state as the default case.",
3060-
"The connection is fully established and ready to use.",
3077+
"The connection has been created successfully. However, for the up-to-date connection status, please use the service attachment's \"ConnectedEndpoint.status\" as the source of truth.",
30613078
"The connection is not functional since some resources on the connection fail to be created.",
30623079
"The connection is being created.",
30633080
"The connection is being deleted."
@@ -3451,7 +3468,7 @@
34513468
"type": "string"
34523469
},
34533470
"ipCidrRange": {
3454-
"description": "The IP range that this internal range defines.",
3471+
"description": "The IP range that this internal range defines. NOTE: IPv6 ranges are limited to usage=EXTERNAL_TO_VPC and peering=FOR_SELF. NOTE: For IPv6 Ranges this field is compulsory, i.e. the address range must be specified explicitly.",
34553472
"type": "string"
34563473
},
34573474
"labels": {
@@ -3461,6 +3478,10 @@
34613478
"description": "User-defined labels.",
34623479
"type": "object"
34633480
},
3481+
"migration": {
3482+
"$ref": "Migration",
3483+
"description": "Optional. Should be present if usage is set to FOR_MIGRATION."
3484+
},
34643485
"name": {
34653486
"description": "Immutable. The name of an internal range. Format: projects/{project}/locations/{location}/internalRanges/{internal_range} See: https://google.aip.dev/122#fields-representing-resource-names",
34663487
"type": "string"
@@ -3503,7 +3524,7 @@
35033524
"type": "string"
35043525
},
35053526
"prefixLength": {
3506-
"description": "An alternate to ip_cidr_range. Can be set when trying to create a reservation that automatically finds a free range of the given size. If both ip_cidr_range and prefix_length are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size.",
3527+
"description": "An alternate to ip_cidr_range. Can be set when trying to create an IPv4 reservation that automatically finds a free range of the given size. If both ip_cidr_range and prefix_length are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size. NOTE: For IPv6 this field only works if ip_cidr_range is set as well, and both fields must match. In other words, with IPv6 this field only works as a redundant parameter.",
35073528
"format": "int32",
35083529
"type": "integer"
35093530
},
@@ -3524,12 +3545,14 @@
35243545
"enum": [
35253546
"USAGE_UNSPECIFIED",
35263547
"FOR_VPC",
3527-
"EXTERNAL_TO_VPC"
3548+
"EXTERNAL_TO_VPC",
3549+
"FOR_MIGRATION"
35283550
],
35293551
"enumDescriptions": [
35303552
"Unspecified usage is allowed in calls which identify the resource by other fields and do not need Usage set to complete. These are, i.e.: GetInternalRange and DeleteInternalRange. Usage needs to be specified explicitly in CreateInternalRange or UpdateInternalRange calls.",
35313553
"A VPC resource can use the reserved CIDR block by associating it with the internal range resource if usage is set to FOR_VPC.",
3532-
"Ranges created with EXTERNAL_TO_VPC cannot be associated with VPC resources and are meant to block out address ranges for various use cases, like for example, usage on-prem, with dynamic route announcements via interconnect."
3554+
"Ranges created with EXTERNAL_TO_VPC cannot be associated with VPC resources and are meant to block out address ranges for various use cases, like for example, usage on-prem, with dynamic route announcements via interconnect.",
3555+
"Ranges created FOR_MIGRATION can be used to lock a CIDR range between a source and target subnet. If usage is set to FOR_MIGRATION the peering value has to be set to FOR_SELF or default to FOR_SELF when unset."
35333556
],
35343557
"type": "string"
35353558
},
@@ -3549,7 +3572,7 @@
35493572
"id": "LinkedInterconnectAttachments",
35503573
"properties": {
35513574
"includeImportRanges": {
3552-
"description": "Optional. IP ranges allowed to be included during import from hub.(does not control transit connectivity) The only allowed value for now is \"ALL_IPV4_RANGES\".",
3575+
"description": "Optional. IP ranges allowed to be included during import from hub (does not control transit connectivity). The only allowed value for now is \"ALL_IPV4_RANGES\".",
35533576
"items": {
35543577
"type": "string"
35553578
},
@@ -3574,12 +3597,44 @@
35743597
},
35753598
"type": "object"
35763599
},
3600+
"LinkedProducerVpcNetwork": {
3601+
"description": "Next ID: 7",
3602+
"id": "LinkedProducerVpcNetwork",
3603+
"properties": {
3604+
"excludeExportRanges": {
3605+
"description": "Optional. IP ranges encompassing the subnets to be excluded from peering.",
3606+
"items": {
3607+
"type": "string"
3608+
},
3609+
"type": "array"
3610+
},
3611+
"network": {
3612+
"description": "Immutable. The URI of the Service Consumer VPC that the Producer VPC is peered with.",
3613+
"type": "string"
3614+
},
3615+
"peering": {
3616+
"description": "Immutable. The name of the VPC peering between the Service Consumer VPC and the Producer VPC (defined in the Tenant project) which is added to the NCC hub. This peering must be in ACTIVE state.",
3617+
"type": "string"
3618+
},
3619+
"producerNetwork": {
3620+
"description": "Output only. The URI of the Producer VPC.",
3621+
"readOnly": true,
3622+
"type": "string"
3623+
},
3624+
"serviceConsumerVpcSpoke": {
3625+
"description": "Output only. The Service Consumer Network spoke.",
3626+
"readOnly": true,
3627+
"type": "string"
3628+
}
3629+
},
3630+
"type": "object"
3631+
},
35773632
"LinkedRouterApplianceInstances": {
35783633
"description": "A collection of router appliance instances. If you configure multiple router appliance instances to receive data from the same set of sites outside of Google Cloud, we recommend that you associate those instances with the same spoke.",
35793634
"id": "LinkedRouterApplianceInstances",
35803635
"properties": {
35813636
"includeImportRanges": {
3582-
"description": "Optional. IP ranges allowed to be included during import from hub.(does not control transit connectivity) The only allowed value for now is \"ALL_IPV4_RANGES\".",
3637+
"description": "Optional. IP ranges allowed to be included during import from hub (does not control transit connectivity). The only allowed value for now is \"ALL_IPV4_RANGES\".",
35833638
"items": {
35843639
"type": "string"
35853640
},
@@ -3642,7 +3697,7 @@
36423697
"id": "LinkedVpnTunnels",
36433698
"properties": {
36443699
"includeImportRanges": {
3645-
"description": "Optional. IP ranges allowed to be included during import from hub.(does not control transit connectivity) The only allowed value for now is \"ALL_IPV4_RANGES\".",
3700+
"description": "Optional. IP ranges allowed to be included during import from hub (does not control transit connectivity). The only allowed value for now is \"ALL_IPV4_RANGES\".",
36463701
"items": {
36473702
"type": "string"
36483703
},
@@ -4068,6 +4123,21 @@
40684123
},
40694124
"type": "object"
40704125
},
4126+
"Migration": {
4127+
"description": "Specification for migration with source and target resource names.",
4128+
"id": "Migration",
4129+
"properties": {
4130+
"source": {
4131+
"description": "Immutable. Resource path as an URI of the source resource, for example a subnet. The project for the source resource should match the project for the InternalRange. An example: /projects/{project}/regions/{region}/subnetworks/{subnet}",
4132+
"type": "string"
4133+
},
4134+
"target": {
4135+
"description": "Immutable. Resource path of the target resource. The target project can be different, as in the cases when migrating to peer networks. The resource For example: /projects/{project}/regions/{region}/subnetworks/{subnet}",
4136+
"type": "string"
4137+
}
4138+
},
4139+
"type": "object"
4140+
},
40714141
"NextHopInterconnectAttachment": {
40724142
"description": "A route next hop that leads to an interconnect attachment resource.",
40734143
"id": "NextHopInterconnectAttachment",
@@ -4367,14 +4437,15 @@
43674437
"error": {
43684438
"$ref": "GoogleRpcStatus",
43694439
"deprecated": true,
4370-
"description": "The most recent error during operating this connection."
4440+
"description": "The most recent error during operating this connection. Deprecated, please use error_info instead."
43714441
},
43724442
"errorInfo": {
43734443
"$ref": "GoogleRpcErrorInfo",
43744444
"description": "Output only. The error info for the latest error during operating this connection.",
43754445
"readOnly": true
43764446
},
43774447
"errorType": {
4448+
"deprecated": true,
43784449
"description": "The error type indicates whether the error is consumer facing, producer facing or system internal.",
43794450
"enum": [
43804451
"CONNECTION_ERROR_TYPE_UNSPECIFIED",
@@ -4395,9 +4466,17 @@
43954466
"type": "string"
43964467
},
43974468
"producerInstanceId": {
4398-
"description": "Immutable. An immutable identifier for the producer instance.",
4469+
"deprecated": true,
4470+
"description": "Immutable. Deprecated. Use producer_instance_metadata instead. An immutable identifier for the producer instance.",
43994471
"type": "string"
44004472
},
4473+
"producerInstanceMetadata": {
4474+
"additionalProperties": {
4475+
"type": "string"
4476+
},
4477+
"description": "Immutable. An immutable map for the producer instance metadata.",
4478+
"type": "object"
4479+
},
44014480
"pscConnectionId": {
44024481
"description": "The PSC connection id of the PSC forwarding rule.",
44034482
"type": "string"
@@ -4407,6 +4486,11 @@
44074486
"readOnly": true,
44084487
"type": "string"
44094488
},
4489+
"serviceClass": {
4490+
"description": "Output only. [Output only] The service class associated with this PSC Connection. The value is derived from the SCPolicy and matches the service class name provided by the customer.",
4491+
"readOnly": true,
4492+
"type": "string"
4493+
},
44104494
"state": {
44114495
"description": "State of the PSC Connection",
44124496
"enum": [
@@ -4418,7 +4502,7 @@
44184502
],
44194503
"enumDescriptions": [
44204504
"An invalid state as the default case.",
4421-
"The connection is fully established and ready to use.",
4505+
"The connection has been created successfully. However, for the up-to-date connection status, please use the created forwarding rule's \"PscConnectionStatus\" as the source of truth.",
44224506
"The connection is not functional since some resources on the connection fail to be created.",
44234507
"The connection is being created.",
44244508
"The connection is being deleted."
@@ -4882,7 +4966,7 @@
48824966
"id": "ServiceConnectionPolicy",
48834967
"properties": {
48844968
"createTime": {
4885-
"description": "Output only. Time when the ServiceConnectionMap was created.",
4969+
"description": "Output only. Time when the ServiceConnectionPolicy was created.",
48864970
"format": "google-datetime",
48874971
"readOnly": true,
48884972
"type": "string"
@@ -4940,7 +5024,7 @@
49405024
"type": "string"
49415025
},
49425026
"updateTime": {
4943-
"description": "Output only. Time when the ServiceConnectionMap was updated.",
5027+
"description": "Output only. Time when the ServiceConnectionPolicy was updated.",
49445028
"format": "google-datetime",
49455029
"readOnly": true,
49465030
"type": "string"
@@ -5050,6 +5134,10 @@
50505134
"$ref": "LinkedInterconnectAttachments",
50515135
"description": "VLAN attachments that are associated with the spoke."
50525136
},
5137+
"linkedProducerVpcNetwork": {
5138+
"$ref": "LinkedProducerVpcNetwork",
5139+
"description": "Optional. The linked producer VPC that is associated with the spoke."
5140+
},
50535141
"linkedRouterApplianceInstances": {
50545142
"$ref": "LinkedRouterApplianceInstances",
50555143
"description": "Router appliance instances that are associated with the spoke."
@@ -5081,14 +5169,16 @@
50815169
"VPN_TUNNEL",
50825170
"INTERCONNECT_ATTACHMENT",
50835171
"ROUTER_APPLIANCE",
5084-
"VPC_NETWORK"
5172+
"VPC_NETWORK",
5173+
"PRODUCER_VPC_NETWORK"
50855174
],
50865175
"enumDescriptions": [
50875176
"Unspecified spoke type.",
50885177
"Spokes associated with VPN tunnels.",
50895178
"Spokes associated with VLAN attachments.",
50905179
"Spokes associated with router appliance instances.",
5091-
"Spokes associated with VPC networks."
5180+
"Spokes associated with VPC networks.",
5181+
"Spokes that are backed by a producer VPC network."
50925182
],
50935183
"readOnly": true,
50945184
"type": "string"
@@ -5254,14 +5344,16 @@
52545344
"VPN_TUNNEL",
52555345
"INTERCONNECT_ATTACHMENT",
52565346
"ROUTER_APPLIANCE",
5257-
"VPC_NETWORK"
5347+
"VPC_NETWORK",
5348+
"PRODUCER_VPC_NETWORK"
52585349
],
52595350
"enumDescriptions": [
52605351
"Unspecified spoke type.",
52615352
"Spokes associated with VPN tunnels.",
52625353
"Spokes associated with VLAN attachments.",
52635354
"Spokes associated with router appliance instances.",
5264-
"Spokes associated with VPC networks."
5355+
"Spokes associated with VPC networks.",
5356+
"Spokes that are backed by a producer VPC network."
52655357
],
52665358
"readOnly": true,
52675359
"type": "string"

‎discovery/networkconnectivity-v1alpha1.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@
11161116
}
11171117
}
11181118
},
1119-
"revision": "20240807",
1119+
"revision": "20240911",
11201120
"rootUrl": "https://networkconnectivity.googleapis.com/",
11211121
"schemas": {
11221122
"AuditConfig": {
@@ -1383,7 +1383,7 @@
13831383
"type": "string"
13841384
},
13851385
"ipCidrRange": {
1386-
"description": "IP range that this internal range defines.",
1386+
"description": "IP range that this internal range defines. NOTE: IPv6 ranges are limited to usage=EXTERNAL_TO_VPC and peering=FOR_SELF. NOTE: For IPv6 Ranges this field is compulsory, i.e. the address range must be specified explicitly.",
13871387
"type": "string"
13881388
},
13891389
"labels": {
@@ -1439,7 +1439,7 @@
14391439
"type": "string"
14401440
},
14411441
"prefixLength": {
1442-
"description": "An alternative to ip_cidr_range. Can be set when trying to create a reservation that automatically finds a free range of the given size. If both ip_cidr_range and prefix_length are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size.",
1442+
"description": "An alternative to ip_cidr_range. Can be set when trying to create an IPv4 reservation that automatically finds a free range of the given size. If both ip_cidr_range and prefix_length are set, there is an error if the range sizes do not match. Can also be used during updates to change the range size. NOTE: For IPv6 this field only works if ip_cidr_range is set as well, and both fields must match. In other words, with IPv6 this field only works as a redundant parameter.",
14431443
"format": "int32",
14441444
"type": "integer"
14451445
},

0 commit comments

Comments
 (0)