Skip to content

Commit 585b38f

Browse files
authored
feat(DirectLink): refresh SDK to include latest spec changes
1 parent fa9bf00 commit 585b38f

File tree

2 files changed

+78
-59
lines changed

2 files changed

+78
-59
lines changed

ibm_cloud_networking_services/direct_link_apis_v1.py

Lines changed: 65 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -355,15 +355,19 @@ def create_gateway_action(self,
355355
356356
:param str id: Direct Link Connect gateway identifier.
357357
:param str action: Action request.
358-
:param bool global_: (optional) Set for create_gateway_approve requests to
359-
select the gateway's routing option. Gateways with global routing (`true`)
360-
can connect to networks outside of their associated region.
361-
:param bool metered: (optional) Set for create_gateway_approve requests to
362-
select the gateway's metered billing option. When `true` gateway usage is
363-
billed per gigabyte. When `false` there is no per gigabyte usage charge,
364-
instead a flat rate is charged for the gateway.
358+
:param bool global_: (optional) Required for create_gateway_approve
359+
requests to select the gateway's routing option. Gateways with global
360+
routing (`true`) can connect to networks outside of their associated
361+
region.
362+
:param bool metered: (optional) Required for create_gateway_approve
363+
requests to select the gateway's metered billing option. When `true`
364+
gateway usage is billed per gigabyte. When `false` there is no per
365+
gigabyte usage charge, instead a flat rate is charged for the gateway.
365366
:param ResourceGroupIdentity resource_group: (optional) Set for
366-
create_gateway_approve requests to select the gateway's resource group.
367+
create_gateway_approve requests to select the gateway's resource group. If
368+
unspecified on create_gateway_approve, the account's [default resource
369+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is
370+
used.
367371
:param List[object] updates: (optional) Specify attribute updates being
368372
approved or rejected, update_attributes_approve and
369373
update_attributes_reject actions must provide an updates field that matches
@@ -1095,31 +1099,31 @@ class CrossConnectRouter():
10951099
"""
10961100
Cross Connect Router details.
10971101
1098-
:attr str name: (optional) The name of the Router.
1102+
:attr str router_name: (optional) The name of the Router.
10991103
:attr int total_connections: (optional) Count of existing Direct Link Dedicated
11001104
gateways on this router for this account.
11011105
"""
11021106

11031107
def __init__(self,
11041108
*,
1105-
name: str = None,
1109+
router_name: str = None,
11061110
total_connections: int = None) -> None:
11071111
"""
11081112
Initialize a CrossConnectRouter object.
11091113
1110-
:param str name: (optional) The name of the Router.
1114+
:param str router_name: (optional) The name of the Router.
11111115
:param int total_connections: (optional) Count of existing Direct Link
11121116
Dedicated gateways on this router for this account.
11131117
"""
1114-
self.name = name
1118+
self.router_name = router_name
11151119
self.total_connections = total_connections
11161120

11171121
@classmethod
11181122
def from_dict(cls, _dict: Dict) -> 'CrossConnectRouter':
11191123
"""Initialize a CrossConnectRouter object from a json dictionary."""
11201124
args = {}
1121-
if 'name' in _dict:
1122-
args['name'] = _dict.get('name')
1125+
if 'router_name' in _dict:
1126+
args['router_name'] = _dict.get('router_name')
11231127
if 'total_connections' in _dict:
11241128
args['total_connections'] = _dict.get('total_connections')
11251129
return cls(**args)
@@ -1132,8 +1136,8 @@ def _from_dict(cls, _dict):
11321136
def to_dict(self) -> Dict:
11331137
"""Return a json dictionary representing this model."""
11341138
_dict = {}
1135-
if hasattr(self, 'name') and self.name is not None:
1136-
_dict['name'] = self.name
1139+
if hasattr(self, 'router_name') and self.router_name is not None:
1140+
_dict['router_name'] = self.router_name
11371141
if hasattr(self, 'total_connections') and self.total_connections is not None:
11381142
_dict['total_connections'] = self.total_connections
11391143
return _dict
@@ -1508,6 +1512,7 @@ class OperationalStatusEnum(str, Enum):
15081512
AWAITING_COMPLETION_NOTICE = 'awaiting_completion_notice'
15091513
AWAITING_LOA = 'awaiting_loa'
15101514
CREATE_PENDING = 'create_pending'
1515+
CREATE_REJECTED = 'create_rejected'
15111516
COMPLETION_NOTICE_APPROVED = 'completion_notice_approved'
15121517
COMPLETION_NOTICE_RECEIVED = 'completion_notice_received'
15131518
COMPLETION_NOTICE_REJECTED = 'completion_notice_rejected'
@@ -1731,8 +1736,7 @@ class GatewayTemplate():
17311736
:attr str name: The unique user-defined name for this gateway.
17321737
:attr ResourceGroupIdentity resource_group: (optional) Resource group for this
17331738
resource. If unspecified, the account's [default resource
1734-
group](https://console.bluemix.net/apidocs/resource-manager#introduction) is
1735-
used.
1739+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
17361740
:attr int speed_mbps: Gateway speed in megabits per second.
17371741
:attr str type: Gateway type.
17381742
"""
@@ -1770,8 +1774,8 @@ def __init__(self,
17701774
ommitted and a CIDR will be selected automatically.
17711775
:param ResourceGroupIdentity resource_group: (optional) Resource group for
17721776
this resource. If unspecified, the account's [default resource
1773-
group](https://console.bluemix.net/apidocs/resource-manager#introduction)
1774-
is used.
1777+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is
1778+
used.
17751779
"""
17761780
msg = "Cannot instantiate base class. Instead, instantiate one of the defined subclasses: {0}".format(
17771781
", ".join(['GatewayTemplateGatewayTypeDedicatedTemplate', 'GatewayTemplateGatewayTypeConnectTemplate']))
@@ -2120,45 +2124,59 @@ class LocationOutput():
21202124
"""
21212125
location.
21222126
2123-
:attr str billing_location: Billing location.
2127+
:attr str billing_location: (optional) Billing location. Only present for
2128+
locations where provisioning is enabled.
21242129
:attr str building_colocation_owner: (optional) Building colocation owner. Only
2125-
present for offering_type=dedicated locations.
2130+
present for offering_type=dedicated locations where provisioning is enabled.
21262131
:attr str display_name: Location long name.
21272132
:attr str location_type: Location type.
21282133
:attr str market: Location market.
2129-
:attr str market_geography: Location geography.
2130-
:attr bool mzr: Is location a multi-zone region (MZR).
2134+
:attr str market_geography: (optional) Location geography. Only present for
2135+
locations where provisioning is enabled.
2136+
:attr bool mzr: (optional) Is location a multi-zone region (MZR). Only present
2137+
for locations where provisioning is enabled.
21312138
:attr str name: Location short name.
21322139
:attr str offering_type: Location offering type.
2133-
:attr str vpc_region: (optional) Location's VPC region.
2140+
:attr bool provision_enabled: Indicates for the specific offering_type whether
2141+
this location supports gateway provisioning.
2142+
:attr str vpc_region: (optional) Location's VPC region. Only present for
2143+
locations where provisioning is enabled.
21342144
"""
21352145

21362146
def __init__(self,
2137-
billing_location: str,
21382147
display_name: str,
21392148
location_type: str,
21402149
market: str,
2141-
market_geography: str,
2142-
mzr: bool,
21432150
name: str,
21442151
offering_type: str,
2152+
provision_enabled: bool,
21452153
*,
2154+
billing_location: str = None,
21462155
building_colocation_owner: str = None,
2156+
market_geography: str = None,
2157+
mzr: bool = None,
21472158
vpc_region: str = None) -> None:
21482159
"""
21492160
Initialize a LocationOutput object.
21502161
2151-
:param str billing_location: Billing location.
21522162
:param str display_name: Location long name.
21532163
:param str location_type: Location type.
21542164
:param str market: Location market.
2155-
:param str market_geography: Location geography.
2156-
:param bool mzr: Is location a multi-zone region (MZR).
21572165
:param str name: Location short name.
21582166
:param str offering_type: Location offering type.
2167+
:param bool provision_enabled: Indicates for the specific offering_type
2168+
whether this location supports gateway provisioning.
2169+
:param str billing_location: (optional) Billing location. Only present for
2170+
locations where provisioning is enabled.
21592171
:param str building_colocation_owner: (optional) Building colocation owner.
2160-
Only present for offering_type=dedicated locations.
2161-
:param str vpc_region: (optional) Location's VPC region.
2172+
Only present for offering_type=dedicated locations where provisioning is
2173+
enabled.
2174+
:param str market_geography: (optional) Location geography. Only present
2175+
for locations where provisioning is enabled.
2176+
:param bool mzr: (optional) Is location a multi-zone region (MZR). Only
2177+
present for locations where provisioning is enabled.
2178+
:param str vpc_region: (optional) Location's VPC region. Only present for
2179+
locations where provisioning is enabled.
21622180
"""
21632181
self.billing_location = billing_location
21642182
self.building_colocation_owner = building_colocation_owner
@@ -2169,6 +2187,7 @@ def __init__(self,
21692187
self.mzr = mzr
21702188
self.name = name
21712189
self.offering_type = offering_type
2190+
self.provision_enabled = provision_enabled
21722191
self.vpc_region = vpc_region
21732192

21742193
@classmethod
@@ -2177,8 +2196,6 @@ def from_dict(cls, _dict: Dict) -> 'LocationOutput':
21772196
args = {}
21782197
if 'billing_location' in _dict:
21792198
args['billing_location'] = _dict.get('billing_location')
2180-
else:
2181-
raise ValueError('Required property \'billing_location\' not present in LocationOutput JSON')
21822199
if 'building_colocation_owner' in _dict:
21832200
args['building_colocation_owner'] = _dict.get('building_colocation_owner')
21842201
if 'display_name' in _dict:
@@ -2195,12 +2212,8 @@ def from_dict(cls, _dict: Dict) -> 'LocationOutput':
21952212
raise ValueError('Required property \'market\' not present in LocationOutput JSON')
21962213
if 'market_geography' in _dict:
21972214
args['market_geography'] = _dict.get('market_geography')
2198-
else:
2199-
raise ValueError('Required property \'market_geography\' not present in LocationOutput JSON')
22002215
if 'mzr' in _dict:
22012216
args['mzr'] = _dict.get('mzr')
2202-
else:
2203-
raise ValueError('Required property \'mzr\' not present in LocationOutput JSON')
22042217
if 'name' in _dict:
22052218
args['name'] = _dict.get('name')
22062219
else:
@@ -2209,6 +2222,10 @@ def from_dict(cls, _dict: Dict) -> 'LocationOutput':
22092222
args['offering_type'] = _dict.get('offering_type')
22102223
else:
22112224
raise ValueError('Required property \'offering_type\' not present in LocationOutput JSON')
2225+
if 'provision_enabled' in _dict:
2226+
args['provision_enabled'] = _dict.get('provision_enabled')
2227+
else:
2228+
raise ValueError('Required property \'provision_enabled\' not present in LocationOutput JSON')
22122229
if 'vpc_region' in _dict:
22132230
args['vpc_region'] = _dict.get('vpc_region')
22142231
return cls(**args)
@@ -2239,6 +2256,8 @@ def to_dict(self) -> Dict:
22392256
_dict['name'] = self.name
22402257
if hasattr(self, 'offering_type') and self.offering_type is not None:
22412258
_dict['offering_type'] = self.offering_type
2259+
if hasattr(self, 'provision_enabled') and self.provision_enabled is not None:
2260+
_dict['provision_enabled'] = self.provision_enabled
22422261
if hasattr(self, 'vpc_region') and self.vpc_region is not None:
22432262
_dict['vpc_region'] = self.vpc_region
22442263
return _dict
@@ -2717,7 +2736,7 @@ def __ne__(self, other: 'PortsPaginatedCollectionNext') -> bool:
27172736
class ResourceGroupIdentity():
27182737
"""
27192738
Resource group for this resource. If unspecified, the account's [default resource
2720-
group](https://console.bluemix.net/apidocs/resource-manager#introduction) is used.
2739+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
27212740
27222741
:attr str id: Resource group identifier.
27232742
"""
@@ -3049,8 +3068,7 @@ class GatewayTemplateGatewayTypeConnectTemplate(GatewayTemplate):
30493068
:attr str name: The unique user-defined name for this gateway.
30503069
:attr ResourceGroupIdentity resource_group: (optional) Resource group for this
30513070
resource. If unspecified, the account's [default resource
3052-
group](https://console.bluemix.net/apidocs/resource-manager#introduction) is
3053-
used.
3071+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
30543072
:attr int speed_mbps: Gateway speed in megabits per second.
30553073
:attr str type: Gateway type.
30563074
:attr GatewayPortIdentity port: Select Port Label for new type=connect gateway.
@@ -3092,8 +3110,8 @@ def __init__(self,
30923110
ommitted and a CIDR will be selected automatically.
30933111
:param ResourceGroupIdentity resource_group: (optional) Resource group for
30943112
this resource. If unspecified, the account's [default resource
3095-
group](https://console.bluemix.net/apidocs/resource-manager#introduction)
3096-
is used.
3113+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is
3114+
used.
30973115
"""
30983116
# pylint: disable=super-init-not-called
30993117
self.bgp_asn = bgp_asn
@@ -3230,8 +3248,7 @@ class GatewayTemplateGatewayTypeDedicatedTemplate(GatewayTemplate):
32303248
:attr str name: The unique user-defined name for this gateway.
32313249
:attr ResourceGroupIdentity resource_group: (optional) Resource group for this
32323250
resource. If unspecified, the account's [default resource
3233-
group](https://console.bluemix.net/apidocs/resource-manager#introduction) is
3234-
used.
3251+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
32353252
:attr int speed_mbps: Gateway speed in megabits per second.
32363253
:attr str type: Gateway type.
32373254
:attr str carrier_name: Carrier name.
@@ -3285,8 +3302,8 @@ def __init__(self,
32853302
ommitted and a CIDR will be selected automatically.
32863303
:param ResourceGroupIdentity resource_group: (optional) Resource group for
32873304
this resource. If unspecified, the account's [default resource
3288-
group](https://console.bluemix.net/apidocs/resource-manager#introduction)
3289-
is used.
3305+
group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is
3306+
used.
32903307
:param str dedicated_hosting_id: (optional) The unique identifier of the
32913308
dedicated hosting instance for this gateway. Valid only for Dedicated
32923309
Hosting Offering.

0 commit comments

Comments
 (0)