Skip to content

Commit

Permalink
Releasing version 1.3.4 (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
mross22 authored Jun 17, 2017
1 parent 53c6a10 commit bfa6e95
Show file tree
Hide file tree
Showing 43 changed files with 28 additions and 272 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ data/
dist/
__pycache__/
env/
docs/warnings.txt
docs/_build/
docs/apidocs/
oraclebmc/models/init_*
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.

The format is based on `Keep a Changelog <http://keepachangelog.com/>`_.

====================
1.3.4 - 2017-06-16
====================

-------
Fixed
-------

* Fixed bug in support for load balancing service.

====================
1.3.3 - 2017-06-09
====================
Expand Down
2 changes: 1 addition & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXOPTS = -w warnings.txt
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build
Expand Down
4 changes: 2 additions & 2 deletions docs/api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ Load Balancer
Client
--------

.. autoclass:: oraclebmc.loadbalancer.load_balancer_client.LoadBalancerClient
.. autoclass:: oraclebmc.load_balancer.load_balancer_client.LoadBalancerClient
:members:

--------
Models
--------

.. automodule:: oraclebmc.loadbalancer.models
.. automodule:: oraclebmc.load_balancer.models
:members:
:undoc-members:
:imported-members:
Expand Down
4 changes: 2 additions & 2 deletions oraclebmc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# coding: utf-8
# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.

from . import config, constants, core, exceptions, identity, object_storage, regions
from . import config, constants, core, exceptions, identity, load_balancer, object_storage, regions
from .base_client import BaseClient
from .request import Request
from .response import Response
Expand All @@ -13,5 +13,5 @@
__all__ = [
"BaseClient", "Error", "Request", "Response", "Signer",
"config", "constants", "core", "exceptions", "identity",
"object_storage", "regions", "wait_until"
"load_balancer", "object_storage", "regions", "wait_until"
]
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ..config import get_config_value_or_default, validate_config
from ..signer import Signer
from ..util import Sentinel
from .models import loadbalancer_type_mapping
from .models import load_balancer_type_mapping
missing = Sentinel("Missing")


Expand All @@ -24,7 +24,7 @@ def __init__(self, config):
private_key_file_location=config["key_file"],
pass_phrase=get_config_value_or_default(config, "pass_phrase")
)
self.base_client = BaseClient("load_balancer", config, signer, loadbalancer_type_mapping)
self.base_client = BaseClient("load_balancer", config, signer, load_balancer_type_mapping)

def create_backend(self, create_backend_details, load_balancer_id, backend_set_name, **kwargs):
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
from .work_request import WorkRequest
from .work_request_error import WorkRequestError

# Maps type names to classes for loadbalancer services.
loadbalancer_type_mapping = {
# Maps type names to classes for load_balancer services.
load_balancer_type_mapping = {
"Backend": Backend,
"BackendDetails": BackendDetails,
"BackendSet": BackendSet,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
178 changes: 0 additions & 178 deletions oraclebmc/loadbalancer/models/backend_health.py

This file was deleted.

83 changes: 0 additions & 83 deletions oraclebmc/loadbalancer/models/backend_set_health.py

This file was deleted.

3 changes: 2 additions & 1 deletion oraclebmc/regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"blockstorage": "https://iaas.{domain}/20160918",
"compute": "https://iaas.{domain}/20160918",
"virtual_network": "https://iaas.{domain}/20160918",
"object_storage": "https://objectstorage.{domain}"
"object_storage": "https://objectstorage.{domain}",
"load_balancer": "https://iaas.{domain}/20170115"
}

DOMAIN_FORMAT = "{region}.oraclecloud.com"
Expand Down
2 changes: 1 addition & 1 deletion oraclebmc/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# coding: utf-8
# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.

__version__ = "1.3.3"
__version__ = "1.3.4"
5 changes: 5 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,8 @@ def compute(config):
@pytest.fixture
def virtual_network(config):
return oraclebmc.core.VirtualNetworkClient(config)


@pytest.fixture
def load_balancer_client(config):
return oraclebmc.load_balancer.LoadBalancerClient(config)

0 comments on commit bfa6e95

Please sign in to comment.