Skip to content

Commit 0926bc0

Browse files
committed
Bump version, regen modules
1 parent 0eebfc3 commit 0926bc0

16 files changed

+342
-18
lines changed

openshift/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpenShift provides builds, application lifecycle, image content management, and
44
This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
55

66
- API version: latest
7-
- Package version: 0.3.0
7+
- Package version: 0.3.1
88
- Build package: io.swagger.codegen.languages.PythonClientCodegen
99

1010
## Requirements.
@@ -1270,6 +1270,7 @@ Class | Method | HTTP request | Description
12701270
- [V1CephFSVolumeSource](docs/V1CephFSVolumeSource.md)
12711271
- [V1CinderVolumeSource](docs/V1CinderVolumeSource.md)
12721272
- [V1ClusterNetwork](docs/V1ClusterNetwork.md)
1273+
- [V1ClusterNetworkEntry](docs/V1ClusterNetworkEntry.md)
12731274
- [V1ClusterNetworkList](docs/V1ClusterNetworkList.md)
12741275
- [V1ClusterResourceQuota](docs/V1ClusterResourceQuota.md)
12751276
- [V1ClusterResourceQuotaList](docs/V1ClusterResourceQuotaList.md)

openshift/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818

1919
# Do not edit these constants. They will be updated automatically
2020
# by scripts/update-client.sh.
21-
__version__ = "0.3.0"
21+
__version__ = "0.3.1"
2222
__k8s_client_version__ = "3.0.0"

openshift/client/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
from .models.v1_build_trigger_cause import V1BuildTriggerCause
4242
from .models.v1_build_trigger_policy import V1BuildTriggerPolicy
4343
from .models.v1_cluster_network import V1ClusterNetwork
44+
from .models.v1_cluster_network_entry import V1ClusterNetworkEntry
4445
from .models.v1_cluster_network_list import V1ClusterNetworkList
4546
from .models.v1_cluster_resource_quota import V1ClusterResourceQuota
4647
from .models.v1_cluster_resource_quota_list import V1ClusterResourceQuotaList

openshift/client/models/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
from .v1_build_trigger_cause import V1BuildTriggerCause
4242
from .v1_build_trigger_policy import V1BuildTriggerPolicy
4343
from .v1_cluster_network import V1ClusterNetwork
44+
from .v1_cluster_network_entry import V1ClusterNetworkEntry
4445
from .v1_cluster_network_list import V1ClusterNetworkList
4546
from .v1_cluster_resource_quota import V1ClusterResourceQuota
4647
from .v1_cluster_resource_quota_list import V1ClusterResourceQuotaList

openshift/client/models/v1_cluster_network.py

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class V1ClusterNetwork(object):
2121
NOTE: This class is auto generated by the swagger code generator program.
2222
Do not edit the class manually.
2323
"""
24-
def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=None, network=None, plugin_name=None, service_network=None):
24+
def __init__(self, api_version=None, cluster_networks=None, hostsubnetlength=None, kind=None, metadata=None, network=None, plugin_name=None, service_network=None):
2525
"""
2626
V1ClusterNetwork - a model defined in Swagger
2727
@@ -32,6 +32,7 @@ def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=
3232
"""
3333
self.swagger_types = {
3434
'api_version': 'str',
35+
'cluster_networks': 'list[V1ClusterNetworkEntry]',
3536
'hostsubnetlength': 'int',
3637
'kind': 'str',
3738
'metadata': 'V1ObjectMeta',
@@ -42,6 +43,7 @@ def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=
4243

4344
self.attribute_map = {
4445
'api_version': 'apiVersion',
46+
'cluster_networks': 'clusterNetworks',
4547
'hostsubnetlength': 'hostsubnetlength',
4648
'kind': 'kind',
4749
'metadata': 'metadata',
@@ -51,6 +53,7 @@ def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=
5153
}
5254

5355
self._api_version = api_version
56+
self._cluster_networks = cluster_networks
5457
self._hostsubnetlength = hostsubnetlength
5558
self._kind = kind
5659
self._metadata = metadata
@@ -81,6 +84,31 @@ def api_version(self, api_version):
8184

8285
self._api_version = api_version
8386

87+
@property
88+
def cluster_networks(self):
89+
"""
90+
Gets the cluster_networks of this V1ClusterNetwork.
91+
ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from.
92+
93+
:return: The cluster_networks of this V1ClusterNetwork.
94+
:rtype: list[V1ClusterNetworkEntry]
95+
"""
96+
return self._cluster_networks
97+
98+
@cluster_networks.setter
99+
def cluster_networks(self, cluster_networks):
100+
"""
101+
Sets the cluster_networks of this V1ClusterNetwork.
102+
ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from.
103+
104+
:param cluster_networks: The cluster_networks of this V1ClusterNetwork.
105+
:type: list[V1ClusterNetworkEntry]
106+
"""
107+
if cluster_networks is None:
108+
raise ValueError("Invalid value for `cluster_networks`, must not be `None`")
109+
110+
self._cluster_networks = cluster_networks
111+
84112
@property
85113
def hostsubnetlength(self):
86114
"""
@@ -101,8 +129,6 @@ def hostsubnetlength(self, hostsubnetlength):
101129
:param hostsubnetlength: The hostsubnetlength of this V1ClusterNetwork.
102130
:type: int
103131
"""
104-
if hostsubnetlength is None:
105-
raise ValueError("Invalid value for `hostsubnetlength`, must not be `None`")
106132

107133
self._hostsubnetlength = hostsubnetlength
108134

@@ -172,8 +198,6 @@ def network(self, network):
172198
:param network: The network of this V1ClusterNetwork.
173199
:type: str
174200
"""
175-
if network is None:
176-
raise ValueError("Invalid value for `network`, must not be `None`")
177201

178202
self._network = network
179203

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
# coding: utf-8
2+
3+
"""
4+
OpenShift API (with Kubernetes)
5+
6+
OpenShift provides builds, application lifecycle, image content management, and administrative policy on top of Kubernetes. The API allows consistent management of those objects. All API operations are authenticated via an Authorization bearer token that is provided for service accounts as a generated secret (in JWT form) or via the native OAuth endpoint located at /oauth/authorize. Core infrastructure components may use client certificates that require no authentication. All API operations return a 'resourceVersion' string that represents the version of the object in the underlying storage. The standard LIST operation performs a snapshot read of the underlying objects, returning a resourceVersion representing a consistent version of the listed objects. The WATCH operation allows all updates to a set of objects after the provided resourceVersion to be observed by a client. By listing and beginning a watch from the returned resourceVersion, clients may observe a consistent view of the state of one or more objects. Note that WATCH always returns the update after the provided resourceVersion. Watch may be extended a limited time in the past - using etcd 2 the watch window is 1000 events (which on a large cluster may only be a few tens of seconds) so clients must explicitly handle the \"watch to old error\" by re-listing. Objects are divided into two rough categories - those that have a lifecycle and must reflect the state of the cluster, and those that have no state. Objects with lifecycle typically have three main sections: * 'metadata' common to all objects * a 'spec' that represents the desired state * a 'status' that represents how much of the desired state is reflected on the cluster at the current time Objects that have no state have 'metadata' but may lack a 'spec' or 'status' section. Objects are divided into those that are namespace scoped (only exist inside of a namespace) and those that are cluster scoped (exist outside of a namespace). A namespace scoped resource will be deleted when the namespace is deleted and cannot be created if the namespace has not yet been created or is in the process of deletion. Cluster scoped resources are typically only accessible to admins - resources like nodes, persistent volumes, and cluster policy. All objects have a schema that is a combination of the 'kind' and 'apiVersion' fields. This schema is additive only for any given version - no backwards incompatible changes are allowed without incrementing the apiVersion. The server will return and accept a number of standard responses that share a common schema - for instance, the common error type is 'metav1.Status' (described below) and will be returned on any error from the API server. The API is available in multiple serialization formats - the default is JSON (Accept: application/json and Content-Type: application/json) but clients may also use YAML (application/yaml) or the native Protobuf schema (application/vnd.kubernetes.protobuf). Note that the format of the WATCH API call is slightly different - for JSON it returns newline delimited objects while for Protobuf it returns length-delimited frames (4 bytes in network-order) that contain a 'versioned.Watch' Protobuf object. See the OpenShift documentation at https://docs.openshift.org for more information.
7+
8+
OpenAPI spec version: latest
9+
10+
Generated by: https://github.com/swagger-api/swagger-codegen.git
11+
"""
12+
13+
14+
from pprint import pformat
15+
from six import iteritems
16+
import re
17+
18+
19+
class V1ClusterNetworkEntry(object):
20+
"""
21+
NOTE: This class is auto generated by the swagger code generator program.
22+
Do not edit the class manually.
23+
"""
24+
def __init__(self, cidr=None, host_subnet_length=None):
25+
"""
26+
V1ClusterNetworkEntry - a model defined in Swagger
27+
28+
:param dict swaggerTypes: The key is attribute name
29+
and the value is attribute type.
30+
:param dict attributeMap: The key is attribute name
31+
and the value is json key in definition.
32+
"""
33+
self.swagger_types = {
34+
'cidr': 'str',
35+
'host_subnet_length': 'int'
36+
}
37+
38+
self.attribute_map = {
39+
'cidr': 'CIDR',
40+
'host_subnet_length': 'hostSubnetLength'
41+
}
42+
43+
self._cidr = cidr
44+
self._host_subnet_length = host_subnet_length
45+
46+
@property
47+
def cidr(self):
48+
"""
49+
Gets the cidr of this V1ClusterNetworkEntry.
50+
CIDR defines the total range of a cluster networks address space.
51+
52+
:return: The cidr of this V1ClusterNetworkEntry.
53+
:rtype: str
54+
"""
55+
return self._cidr
56+
57+
@cidr.setter
58+
def cidr(self, cidr):
59+
"""
60+
Sets the cidr of this V1ClusterNetworkEntry.
61+
CIDR defines the total range of a cluster networks address space.
62+
63+
:param cidr: The cidr of this V1ClusterNetworkEntry.
64+
:type: str
65+
"""
66+
if cidr is None:
67+
raise ValueError("Invalid value for `cidr`, must not be `None`")
68+
69+
self._cidr = cidr
70+
71+
@property
72+
def host_subnet_length(self):
73+
"""
74+
Gets the host_subnet_length of this V1ClusterNetworkEntry.
75+
HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.
76+
77+
:return: The host_subnet_length of this V1ClusterNetworkEntry.
78+
:rtype: int
79+
"""
80+
return self._host_subnet_length
81+
82+
@host_subnet_length.setter
83+
def host_subnet_length(self, host_subnet_length):
84+
"""
85+
Sets the host_subnet_length of this V1ClusterNetworkEntry.
86+
HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.
87+
88+
:param host_subnet_length: The host_subnet_length of this V1ClusterNetworkEntry.
89+
:type: int
90+
"""
91+
if host_subnet_length is None:
92+
raise ValueError("Invalid value for `host_subnet_length`, must not be `None`")
93+
94+
self._host_subnet_length = host_subnet_length
95+
96+
def to_dict(self):
97+
"""
98+
Returns the model properties as a dict
99+
"""
100+
result = {}
101+
102+
for attr, _ in iteritems(self.swagger_types):
103+
value = getattr(self, attr)
104+
if isinstance(value, list):
105+
result[attr] = list(map(
106+
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
107+
value
108+
))
109+
elif hasattr(value, "to_dict"):
110+
result[attr] = value.to_dict()
111+
elif isinstance(value, dict):
112+
result[attr] = dict(map(
113+
lambda item: (item[0], item[1].to_dict())
114+
if hasattr(item[1], "to_dict") else item,
115+
value.items()
116+
))
117+
else:
118+
result[attr] = value
119+
120+
return result
121+
122+
def to_str(self):
123+
"""
124+
Returns the string representation of the model
125+
"""
126+
return pformat(self.to_dict())
127+
128+
def __repr__(self):
129+
"""
130+
For `print` and `pprint`
131+
"""
132+
return self.to_str()
133+
134+
def __eq__(self, other):
135+
"""
136+
Returns true if both objects are equal
137+
"""
138+
if not isinstance(other, V1ClusterNetworkEntry):
139+
return False
140+
141+
return self.__dict__ == other.__dict__
142+
143+
def __ne__(self, other):
144+
"""
145+
Returns true if both objects are not equal
146+
"""
147+
return not self == other

openshift/client/models/v1_host_subnet.py

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class V1HostSubnet(object):
2121
NOTE: This class is auto generated by the swagger code generator program.
2222
Do not edit the class manually.
2323
"""
24-
def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadata=None, subnet=None):
24+
def __init__(self, api_version=None, egress_i_ps=None, host=None, host_ip=None, kind=None, metadata=None, subnet=None):
2525
"""
2626
V1HostSubnet - a model defined in Swagger
2727
@@ -32,6 +32,7 @@ def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadat
3232
"""
3333
self.swagger_types = {
3434
'api_version': 'str',
35+
'egress_i_ps': 'list[str]',
3536
'host': 'str',
3637
'host_ip': 'str',
3738
'kind': 'str',
@@ -41,6 +42,7 @@ def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadat
4142

4243
self.attribute_map = {
4344
'api_version': 'apiVersion',
45+
'egress_i_ps': 'egressIPs',
4446
'host': 'host',
4547
'host_ip': 'hostIP',
4648
'kind': 'kind',
@@ -49,6 +51,7 @@ def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadat
4951
}
5052

5153
self._api_version = api_version
54+
self._egress_i_ps = egress_i_ps
5255
self._host = host
5356
self._host_ip = host_ip
5457
self._kind = kind
@@ -78,6 +81,31 @@ def api_version(self, api_version):
7881

7982
self._api_version = api_version
8083

84+
@property
85+
def egress_i_ps(self):
86+
"""
87+
Gets the egress_i_ps of this V1HostSubnet.
88+
EgressIPs is the list of automatic egress IP addresses currently hosted by this node
89+
90+
:return: The egress_i_ps of this V1HostSubnet.
91+
:rtype: list[str]
92+
"""
93+
return self._egress_i_ps
94+
95+
@egress_i_ps.setter
96+
def egress_i_ps(self, egress_i_ps):
97+
"""
98+
Sets the egress_i_ps of this V1HostSubnet.
99+
EgressIPs is the list of automatic egress IP addresses currently hosted by this node
100+
101+
:param egress_i_ps: The egress_i_ps of this V1HostSubnet.
102+
:type: list[str]
103+
"""
104+
if egress_i_ps is None:
105+
raise ValueError("Invalid value for `egress_i_ps`, must not be `None`")
106+
107+
self._egress_i_ps = egress_i_ps
108+
81109
@property
82110
def host(self):
83111
"""

openshift/client/models/v1_net_namespace.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class V1NetNamespace(object):
2121
NOTE: This class is auto generated by the swagger code generator program.
2222
Do not edit the class manually.
2323
"""
24-
def __init__(self, api_version=None, kind=None, metadata=None, netid=None, netname=None):
24+
def __init__(self, api_version=None, egress_i_ps=None, kind=None, metadata=None, netid=None, netname=None):
2525
"""
2626
V1NetNamespace - a model defined in Swagger
2727
@@ -32,6 +32,7 @@ def __init__(self, api_version=None, kind=None, metadata=None, netid=None, netna
3232
"""
3333
self.swagger_types = {
3434
'api_version': 'str',
35+
'egress_i_ps': 'list[str]',
3536
'kind': 'str',
3637
'metadata': 'V1ObjectMeta',
3738
'netid': 'int',
@@ -40,13 +41,15 @@ def __init__(self, api_version=None, kind=None, metadata=None, netid=None, netna
4041

4142
self.attribute_map = {
4243
'api_version': 'apiVersion',
44+
'egress_i_ps': 'egressIPs',
4345
'kind': 'kind',
4446
'metadata': 'metadata',
4547
'netid': 'netid',
4648
'netname': 'netname'
4749
}
4850

4951
self._api_version = api_version
52+
self._egress_i_ps = egress_i_ps
5053
self._kind = kind
5154
self._metadata = metadata
5255
self._netid = netid
@@ -75,6 +78,29 @@ def api_version(self, api_version):
7578

7679
self._api_version = api_version
7780

81+
@property
82+
def egress_i_ps(self):
83+
"""
84+
Gets the egress_i_ps of this V1NetNamespace.
85+
EgressIPs is a list of reserved IPs that will be used as the source for external traffic coming from pods in this namespace. (If empty, external traffic will be masqueraded to Node IPs.)
86+
87+
:return: The egress_i_ps of this V1NetNamespace.
88+
:rtype: list[str]
89+
"""
90+
return self._egress_i_ps
91+
92+
@egress_i_ps.setter
93+
def egress_i_ps(self, egress_i_ps):
94+
"""
95+
Sets the egress_i_ps of this V1NetNamespace.
96+
EgressIPs is a list of reserved IPs that will be used as the source for external traffic coming from pods in this namespace. (If empty, external traffic will be masqueraded to Node IPs.)
97+
98+
:param egress_i_ps: The egress_i_ps of this V1NetNamespace.
99+
:type: list[str]
100+
"""
101+
102+
self._egress_i_ps = egress_i_ps
103+
78104
@property
79105
def kind(self):
80106
"""

0 commit comments

Comments
 (0)