@@ -355,19 +355,15 @@ def create_gateway_action(self,
355
355
356
356
:param str id: Direct Link Connect gateway identifier.
357
357
:param str action: Action request.
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.
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.
366
365
:param ResourceGroupIdentity resource_group: (optional) Set for
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.
366
+ create_gateway_approve requests to select the gateway's resource group.
371
367
:param List[object] updates: (optional) Specify attribute updates being
372
368
approved or rejected, update_attributes_approve and
373
369
update_attributes_reject actions must provide an updates field that matches
@@ -1099,31 +1095,31 @@ class CrossConnectRouter():
1099
1095
"""
1100
1096
Cross Connect Router details.
1101
1097
1102
- :attr str router_name : (optional) The name of the Router.
1098
+ :attr str name : (optional) The name of the Router.
1103
1099
:attr int total_connections: (optional) Count of existing Direct Link Dedicated
1104
1100
gateways on this router for this account.
1105
1101
"""
1106
1102
1107
1103
def __init__ (self ,
1108
1104
* ,
1109
- router_name : str = None ,
1105
+ name : str = None ,
1110
1106
total_connections : int = None ) -> None :
1111
1107
"""
1112
1108
Initialize a CrossConnectRouter object.
1113
1109
1114
- :param str router_name : (optional) The name of the Router.
1110
+ :param str name : (optional) The name of the Router.
1115
1111
:param int total_connections: (optional) Count of existing Direct Link
1116
1112
Dedicated gateways on this router for this account.
1117
1113
"""
1118
- self .router_name = router_name
1114
+ self .name = name
1119
1115
self .total_connections = total_connections
1120
1116
1121
1117
@classmethod
1122
1118
def from_dict (cls , _dict : Dict ) -> 'CrossConnectRouter' :
1123
1119
"""Initialize a CrossConnectRouter object from a json dictionary."""
1124
1120
args = {}
1125
- if 'router_name ' in _dict :
1126
- args ['router_name ' ] = _dict .get ('router_name ' )
1121
+ if 'name ' in _dict :
1122
+ args ['name ' ] = _dict .get ('name ' )
1127
1123
if 'total_connections' in _dict :
1128
1124
args ['total_connections' ] = _dict .get ('total_connections' )
1129
1125
return cls (** args )
@@ -1136,8 +1132,8 @@ def _from_dict(cls, _dict):
1136
1132
def to_dict (self ) -> Dict :
1137
1133
"""Return a json dictionary representing this model."""
1138
1134
_dict = {}
1139
- if hasattr (self , 'router_name ' ) and self .router_name is not None :
1140
- _dict ['router_name ' ] = self .router_name
1135
+ if hasattr (self , 'name ' ) and self .name is not None :
1136
+ _dict ['name ' ] = self .name
1141
1137
if hasattr (self , 'total_connections' ) and self .total_connections is not None :
1142
1138
_dict ['total_connections' ] = self .total_connections
1143
1139
return _dict
@@ -1512,7 +1508,6 @@ class OperationalStatusEnum(str, Enum):
1512
1508
AWAITING_COMPLETION_NOTICE = 'awaiting_completion_notice'
1513
1509
AWAITING_LOA = 'awaiting_loa'
1514
1510
CREATE_PENDING = 'create_pending'
1515
- CREATE_REJECTED = 'create_rejected'
1516
1511
COMPLETION_NOTICE_APPROVED = 'completion_notice_approved'
1517
1512
COMPLETION_NOTICE_RECEIVED = 'completion_notice_received'
1518
1513
COMPLETION_NOTICE_REJECTED = 'completion_notice_rejected'
@@ -1736,7 +1731,8 @@ class GatewayTemplate():
1736
1731
:attr str name: The unique user-defined name for this gateway.
1737
1732
:attr ResourceGroupIdentity resource_group: (optional) Resource group for this
1738
1733
resource. If unspecified, the account's [default resource
1739
- group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
1734
+ group](https://console.bluemix.net/apidocs/resource-manager#introduction) is
1735
+ used.
1740
1736
:attr int speed_mbps: Gateway speed in megabits per second.
1741
1737
:attr str type: Gateway type.
1742
1738
"""
@@ -1774,8 +1770,8 @@ def __init__(self,
1774
1770
ommitted and a CIDR will be selected automatically.
1775
1771
:param ResourceGroupIdentity resource_group: (optional) Resource group for
1776
1772
this resource. If unspecified, the account's [default resource
1777
- group](https://cloud.ibm.com /apidocs/resource-manager#introduction) is
1778
- used.
1773
+ group](https://console.bluemix.net /apidocs/resource-manager#introduction)
1774
+ is used.
1779
1775
"""
1780
1776
msg = "Cannot instantiate base class. Instead, instantiate one of the defined subclasses: {0}" .format (
1781
1777
", " .join (['GatewayTemplateGatewayTypeDedicatedTemplate' , 'GatewayTemplateGatewayTypeConnectTemplate' ]))
@@ -2124,59 +2120,45 @@ class LocationOutput():
2124
2120
"""
2125
2121
location.
2126
2122
2127
- :attr str billing_location: (optional) Billing location. Only present for
2128
- locations where provisioning is enabled.
2123
+ :attr str billing_location: Billing location.
2129
2124
:attr str building_colocation_owner: (optional) Building colocation owner. Only
2130
- present for offering_type=dedicated locations where provisioning is enabled .
2125
+ present for offering_type=dedicated locations.
2131
2126
:attr str display_name: Location long name.
2132
2127
:attr str location_type: Location type.
2133
2128
:attr str market: Location market.
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.
2129
+ :attr str market_geography: Location geography.
2130
+ :attr bool mzr: Is location a multi-zone region (MZR).
2138
2131
:attr str name: Location short name.
2139
2132
:attr str offering_type: Location offering type.
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.
2133
+ :attr str vpc_region: (optional) Location's VPC region.
2144
2134
"""
2145
2135
2146
2136
def __init__ (self ,
2137
+ billing_location : str ,
2147
2138
display_name : str ,
2148
2139
location_type : str ,
2149
2140
market : str ,
2141
+ market_geography : str ,
2142
+ mzr : bool ,
2150
2143
name : str ,
2151
2144
offering_type : str ,
2152
- provision_enabled : bool ,
2153
2145
* ,
2154
- billing_location : str = None ,
2155
2146
building_colocation_owner : str = None ,
2156
- market_geography : str = None ,
2157
- mzr : bool = None ,
2158
2147
vpc_region : str = None ) -> None :
2159
2148
"""
2160
2149
Initialize a LocationOutput object.
2161
2150
2151
+ :param str billing_location: Billing location.
2162
2152
:param str display_name: Location long name.
2163
2153
:param str location_type: Location type.
2164
2154
:param str market: Location market.
2155
+ :param str market_geography: Location geography.
2156
+ :param bool mzr: Is location a multi-zone region (MZR).
2165
2157
:param str name: Location short name.
2166
2158
: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.
2171
2159
:param str building_colocation_owner: (optional) Building colocation owner.
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.
2160
+ Only present for offering_type=dedicated locations.
2161
+ :param str vpc_region: (optional) Location's VPC region.
2180
2162
"""
2181
2163
self .billing_location = billing_location
2182
2164
self .building_colocation_owner = building_colocation_owner
@@ -2187,7 +2169,6 @@ def __init__(self,
2187
2169
self .mzr = mzr
2188
2170
self .name = name
2189
2171
self .offering_type = offering_type
2190
- self .provision_enabled = provision_enabled
2191
2172
self .vpc_region = vpc_region
2192
2173
2193
2174
@classmethod
@@ -2196,6 +2177,8 @@ def from_dict(cls, _dict: Dict) -> 'LocationOutput':
2196
2177
args = {}
2197
2178
if 'billing_location' in _dict :
2198
2179
args ['billing_location' ] = _dict .get ('billing_location' )
2180
+ else :
2181
+ raise ValueError ('Required property \' billing_location\' not present in LocationOutput JSON' )
2199
2182
if 'building_colocation_owner' in _dict :
2200
2183
args ['building_colocation_owner' ] = _dict .get ('building_colocation_owner' )
2201
2184
if 'display_name' in _dict :
@@ -2212,8 +2195,12 @@ def from_dict(cls, _dict: Dict) -> 'LocationOutput':
2212
2195
raise ValueError ('Required property \' market\' not present in LocationOutput JSON' )
2213
2196
if 'market_geography' in _dict :
2214
2197
args ['market_geography' ] = _dict .get ('market_geography' )
2198
+ else :
2199
+ raise ValueError ('Required property \' market_geography\' not present in LocationOutput JSON' )
2215
2200
if 'mzr' in _dict :
2216
2201
args ['mzr' ] = _dict .get ('mzr' )
2202
+ else :
2203
+ raise ValueError ('Required property \' mzr\' not present in LocationOutput JSON' )
2217
2204
if 'name' in _dict :
2218
2205
args ['name' ] = _dict .get ('name' )
2219
2206
else :
@@ -2222,10 +2209,6 @@ def from_dict(cls, _dict: Dict) -> 'LocationOutput':
2222
2209
args ['offering_type' ] = _dict .get ('offering_type' )
2223
2210
else :
2224
2211
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' )
2229
2212
if 'vpc_region' in _dict :
2230
2213
args ['vpc_region' ] = _dict .get ('vpc_region' )
2231
2214
return cls (** args )
@@ -2256,8 +2239,6 @@ def to_dict(self) -> Dict:
2256
2239
_dict ['name' ] = self .name
2257
2240
if hasattr (self , 'offering_type' ) and self .offering_type is not None :
2258
2241
_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
2261
2242
if hasattr (self , 'vpc_region' ) and self .vpc_region is not None :
2262
2243
_dict ['vpc_region' ] = self .vpc_region
2263
2244
return _dict
@@ -2736,7 +2717,7 @@ def __ne__(self, other: 'PortsPaginatedCollectionNext') -> bool:
2736
2717
class ResourceGroupIdentity ():
2737
2718
"""
2738
2719
Resource group for this resource. If unspecified, the account's [default resource
2739
- group](https://cloud.ibm.com /apidocs/resource-manager#introduction) is used.
2720
+ group](https://console.bluemix.net /apidocs/resource-manager#introduction) is used.
2740
2721
2741
2722
:attr str id: Resource group identifier.
2742
2723
"""
@@ -3068,7 +3049,8 @@ class GatewayTemplateGatewayTypeConnectTemplate(GatewayTemplate):
3068
3049
:attr str name: The unique user-defined name for this gateway.
3069
3050
:attr ResourceGroupIdentity resource_group: (optional) Resource group for this
3070
3051
resource. If unspecified, the account's [default resource
3071
- group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
3052
+ group](https://console.bluemix.net/apidocs/resource-manager#introduction) is
3053
+ used.
3072
3054
:attr int speed_mbps: Gateway speed in megabits per second.
3073
3055
:attr str type: Gateway type.
3074
3056
:attr GatewayPortIdentity port: Select Port Label for new type=connect gateway.
@@ -3110,8 +3092,8 @@ def __init__(self,
3110
3092
ommitted and a CIDR will be selected automatically.
3111
3093
:param ResourceGroupIdentity resource_group: (optional) Resource group for
3112
3094
this resource. If unspecified, the account's [default resource
3113
- group](https://cloud.ibm.com /apidocs/resource-manager#introduction) is
3114
- used.
3095
+ group](https://console.bluemix.net /apidocs/resource-manager#introduction)
3096
+ is used.
3115
3097
"""
3116
3098
# pylint: disable=super-init-not-called
3117
3099
self .bgp_asn = bgp_asn
@@ -3248,7 +3230,8 @@ class GatewayTemplateGatewayTypeDedicatedTemplate(GatewayTemplate):
3248
3230
:attr str name: The unique user-defined name for this gateway.
3249
3231
:attr ResourceGroupIdentity resource_group: (optional) Resource group for this
3250
3232
resource. If unspecified, the account's [default resource
3251
- group](https://cloud.ibm.com/apidocs/resource-manager#introduction) is used.
3233
+ group](https://console.bluemix.net/apidocs/resource-manager#introduction) is
3234
+ used.
3252
3235
:attr int speed_mbps: Gateway speed in megabits per second.
3253
3236
:attr str type: Gateway type.
3254
3237
:attr str carrier_name: Carrier name.
@@ -3302,8 +3285,8 @@ def __init__(self,
3302
3285
ommitted and a CIDR will be selected automatically.
3303
3286
:param ResourceGroupIdentity resource_group: (optional) Resource group for
3304
3287
this resource. If unspecified, the account's [default resource
3305
- group](https://cloud.ibm.com /apidocs/resource-manager#introduction) is
3306
- used.
3288
+ group](https://console.bluemix.net /apidocs/resource-manager#introduction)
3289
+ is used.
3307
3290
:param str dedicated_hosting_id: (optional) The unique identifier of the
3308
3291
dedicated hosting instance for this gateway. Valid only for Dedicated
3309
3292
Hosting Offering.
0 commit comments