Skip to content

Commit

Permalink
Bump version, regen modules
Browse files Browse the repository at this point in the history
  • Loading branch information
fabianvf committed Oct 2, 2017
1 parent 0eebfc3 commit 0926bc0
Show file tree
Hide file tree
Showing 16 changed files with 342 additions and 18 deletions.
3 changes: 2 additions & 1 deletion openshift/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ OpenShift provides builds, application lifecycle, image content management, and
This Python package is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:

- API version: latest
- Package version: 0.3.0
- Package version: 0.3.1
- Build package: io.swagger.codegen.languages.PythonClientCodegen

## Requirements.
Expand Down Expand Up @@ -1270,6 +1270,7 @@ Class | Method | HTTP request | Description
- [V1CephFSVolumeSource](docs/V1CephFSVolumeSource.md)
- [V1CinderVolumeSource](docs/V1CinderVolumeSource.md)
- [V1ClusterNetwork](docs/V1ClusterNetwork.md)
- [V1ClusterNetworkEntry](docs/V1ClusterNetworkEntry.md)
- [V1ClusterNetworkList](docs/V1ClusterNetworkList.md)
- [V1ClusterResourceQuota](docs/V1ClusterResourceQuota.md)
- [V1ClusterResourceQuotaList](docs/V1ClusterResourceQuotaList.md)
Expand Down
2 changes: 1 addition & 1 deletion openshift/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

# Do not edit these constants. They will be updated automatically
# by scripts/update-client.sh.
__version__ = "0.3.0"
__version__ = "0.3.1"
__k8s_client_version__ = "3.0.0"
1 change: 1 addition & 0 deletions openshift/client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from .models.v1_build_trigger_cause import V1BuildTriggerCause
from .models.v1_build_trigger_policy import V1BuildTriggerPolicy
from .models.v1_cluster_network import V1ClusterNetwork
from .models.v1_cluster_network_entry import V1ClusterNetworkEntry
from .models.v1_cluster_network_list import V1ClusterNetworkList
from .models.v1_cluster_resource_quota import V1ClusterResourceQuota
from .models.v1_cluster_resource_quota_list import V1ClusterResourceQuotaList
Expand Down
1 change: 1 addition & 0 deletions openshift/client/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from .v1_build_trigger_cause import V1BuildTriggerCause
from .v1_build_trigger_policy import V1BuildTriggerPolicy
from .v1_cluster_network import V1ClusterNetwork
from .v1_cluster_network_entry import V1ClusterNetworkEntry
from .v1_cluster_network_list import V1ClusterNetworkList
from .v1_cluster_resource_quota import V1ClusterResourceQuota
from .v1_cluster_resource_quota_list import V1ClusterResourceQuotaList
Expand Down
34 changes: 29 additions & 5 deletions openshift/client/models/v1_cluster_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class V1ClusterNetwork(object):
NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
"""
def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=None, network=None, plugin_name=None, service_network=None):
def __init__(self, api_version=None, cluster_networks=None, hostsubnetlength=None, kind=None, metadata=None, network=None, plugin_name=None, service_network=None):
"""
V1ClusterNetwork - a model defined in Swagger
Expand All @@ -32,6 +32,7 @@ def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=
"""
self.swagger_types = {
'api_version': 'str',
'cluster_networks': 'list[V1ClusterNetworkEntry]',
'hostsubnetlength': 'int',
'kind': 'str',
'metadata': 'V1ObjectMeta',
Expand All @@ -42,6 +43,7 @@ def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=

self.attribute_map = {
'api_version': 'apiVersion',
'cluster_networks': 'clusterNetworks',
'hostsubnetlength': 'hostsubnetlength',
'kind': 'kind',
'metadata': 'metadata',
Expand All @@ -51,6 +53,7 @@ def __init__(self, api_version=None, hostsubnetlength=None, kind=None, metadata=
}

self._api_version = api_version
self._cluster_networks = cluster_networks
self._hostsubnetlength = hostsubnetlength
self._kind = kind
self._metadata = metadata
Expand Down Expand Up @@ -81,6 +84,31 @@ def api_version(self, api_version):

self._api_version = api_version

@property
def cluster_networks(self):
"""
Gets the cluster_networks of this V1ClusterNetwork.
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.
:return: The cluster_networks of this V1ClusterNetwork.
:rtype: list[V1ClusterNetworkEntry]
"""
return self._cluster_networks

@cluster_networks.setter
def cluster_networks(self, cluster_networks):
"""
Sets the cluster_networks of this V1ClusterNetwork.
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.
:param cluster_networks: The cluster_networks of this V1ClusterNetwork.
:type: list[V1ClusterNetworkEntry]
"""
if cluster_networks is None:
raise ValueError("Invalid value for `cluster_networks`, must not be `None`")

self._cluster_networks = cluster_networks

@property
def hostsubnetlength(self):
"""
Expand All @@ -101,8 +129,6 @@ def hostsubnetlength(self, hostsubnetlength):
:param hostsubnetlength: The hostsubnetlength of this V1ClusterNetwork.
:type: int
"""
if hostsubnetlength is None:
raise ValueError("Invalid value for `hostsubnetlength`, must not be `None`")

self._hostsubnetlength = hostsubnetlength

Expand Down Expand Up @@ -172,8 +198,6 @@ def network(self, network):
:param network: The network of this V1ClusterNetwork.
:type: str
"""
if network is None:
raise ValueError("Invalid value for `network`, must not be `None`")

self._network = network

Expand Down
147 changes: 147 additions & 0 deletions openshift/client/models/v1_cluster_network_entry.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
# coding: utf-8

"""
OpenShift API (with Kubernetes)
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.
OpenAPI spec version: latest
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""


from pprint import pformat
from six import iteritems
import re


class V1ClusterNetworkEntry(object):
"""
NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
"""
def __init__(self, cidr=None, host_subnet_length=None):
"""
V1ClusterNetworkEntry - a model defined in Swagger
:param dict swaggerTypes: The key is attribute name
and the value is attribute type.
:param dict attributeMap: The key is attribute name
and the value is json key in definition.
"""
self.swagger_types = {
'cidr': 'str',
'host_subnet_length': 'int'
}

self.attribute_map = {
'cidr': 'CIDR',
'host_subnet_length': 'hostSubnetLength'
}

self._cidr = cidr
self._host_subnet_length = host_subnet_length

@property
def cidr(self):
"""
Gets the cidr of this V1ClusterNetworkEntry.
CIDR defines the total range of a cluster networks address space.
:return: The cidr of this V1ClusterNetworkEntry.
:rtype: str
"""
return self._cidr

@cidr.setter
def cidr(self, cidr):
"""
Sets the cidr of this V1ClusterNetworkEntry.
CIDR defines the total range of a cluster networks address space.
:param cidr: The cidr of this V1ClusterNetworkEntry.
:type: str
"""
if cidr is None:
raise ValueError("Invalid value for `cidr`, must not be `None`")

self._cidr = cidr

@property
def host_subnet_length(self):
"""
Gets the host_subnet_length of this V1ClusterNetworkEntry.
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.
:return: The host_subnet_length of this V1ClusterNetworkEntry.
:rtype: int
"""
return self._host_subnet_length

@host_subnet_length.setter
def host_subnet_length(self, host_subnet_length):
"""
Sets the host_subnet_length of this V1ClusterNetworkEntry.
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.
:param host_subnet_length: The host_subnet_length of this V1ClusterNetworkEntry.
:type: int
"""
if host_subnet_length is None:
raise ValueError("Invalid value for `host_subnet_length`, must not be `None`")

self._host_subnet_length = host_subnet_length

def to_dict(self):
"""
Returns the model properties as a dict
"""
result = {}

for attr, _ in iteritems(self.swagger_types):
value = getattr(self, attr)
if isinstance(value, list):
result[attr] = list(map(
lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
value
))
elif hasattr(value, "to_dict"):
result[attr] = value.to_dict()
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0], item[1].to_dict())
if hasattr(item[1], "to_dict") else item,
value.items()
))
else:
result[attr] = value

return result

def to_str(self):
"""
Returns the string representation of the model
"""
return pformat(self.to_dict())

def __repr__(self):
"""
For `print` and `pprint`
"""
return self.to_str()

def __eq__(self, other):
"""
Returns true if both objects are equal
"""
if not isinstance(other, V1ClusterNetworkEntry):
return False

return self.__dict__ == other.__dict__

def __ne__(self, other):
"""
Returns true if both objects are not equal
"""
return not self == other
30 changes: 29 additions & 1 deletion openshift/client/models/v1_host_subnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class V1HostSubnet(object):
NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
"""
def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadata=None, subnet=None):
def __init__(self, api_version=None, egress_i_ps=None, host=None, host_ip=None, kind=None, metadata=None, subnet=None):
"""
V1HostSubnet - a model defined in Swagger
Expand All @@ -32,6 +32,7 @@ def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadat
"""
self.swagger_types = {
'api_version': 'str',
'egress_i_ps': 'list[str]',
'host': 'str',
'host_ip': 'str',
'kind': 'str',
Expand All @@ -41,6 +42,7 @@ def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadat

self.attribute_map = {
'api_version': 'apiVersion',
'egress_i_ps': 'egressIPs',
'host': 'host',
'host_ip': 'hostIP',
'kind': 'kind',
Expand All @@ -49,6 +51,7 @@ def __init__(self, api_version=None, host=None, host_ip=None, kind=None, metadat
}

self._api_version = api_version
self._egress_i_ps = egress_i_ps
self._host = host
self._host_ip = host_ip
self._kind = kind
Expand Down Expand Up @@ -78,6 +81,31 @@ def api_version(self, api_version):

self._api_version = api_version

@property
def egress_i_ps(self):
"""
Gets the egress_i_ps of this V1HostSubnet.
EgressIPs is the list of automatic egress IP addresses currently hosted by this node
:return: The egress_i_ps of this V1HostSubnet.
:rtype: list[str]
"""
return self._egress_i_ps

@egress_i_ps.setter
def egress_i_ps(self, egress_i_ps):
"""
Sets the egress_i_ps of this V1HostSubnet.
EgressIPs is the list of automatic egress IP addresses currently hosted by this node
:param egress_i_ps: The egress_i_ps of this V1HostSubnet.
:type: list[str]
"""
if egress_i_ps is None:
raise ValueError("Invalid value for `egress_i_ps`, must not be `None`")

self._egress_i_ps = egress_i_ps

@property
def host(self):
"""
Expand Down
28 changes: 27 additions & 1 deletion openshift/client/models/v1_net_namespace.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class V1NetNamespace(object):
NOTE: This class is auto generated by the swagger code generator program.
Do not edit the class manually.
"""
def __init__(self, api_version=None, kind=None, metadata=None, netid=None, netname=None):
def __init__(self, api_version=None, egress_i_ps=None, kind=None, metadata=None, netid=None, netname=None):
"""
V1NetNamespace - a model defined in Swagger
Expand All @@ -32,6 +32,7 @@ def __init__(self, api_version=None, kind=None, metadata=None, netid=None, netna
"""
self.swagger_types = {
'api_version': 'str',
'egress_i_ps': 'list[str]',
'kind': 'str',
'metadata': 'V1ObjectMeta',
'netid': 'int',
Expand All @@ -40,13 +41,15 @@ def __init__(self, api_version=None, kind=None, metadata=None, netid=None, netna

self.attribute_map = {
'api_version': 'apiVersion',
'egress_i_ps': 'egressIPs',
'kind': 'kind',
'metadata': 'metadata',
'netid': 'netid',
'netname': 'netname'
}

self._api_version = api_version
self._egress_i_ps = egress_i_ps
self._kind = kind
self._metadata = metadata
self._netid = netid
Expand Down Expand Up @@ -75,6 +78,29 @@ def api_version(self, api_version):

self._api_version = api_version

@property
def egress_i_ps(self):
"""
Gets the egress_i_ps of this V1NetNamespace.
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.)
:return: The egress_i_ps of this V1NetNamespace.
:rtype: list[str]
"""
return self._egress_i_ps

@egress_i_ps.setter
def egress_i_ps(self, egress_i_ps):
"""
Sets the egress_i_ps of this V1NetNamespace.
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.)
:param egress_i_ps: The egress_i_ps of this V1NetNamespace.
:type: list[str]
"""

self._egress_i_ps = egress_i_ps

@property
def kind(self):
"""
Expand Down
Loading

0 comments on commit 0926bc0

Please sign in to comment.