The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [1.4.13]
+ Fix bug related to setting the delivery URL for a DR subscriber. (DCAEGEN2-1009)
+
## [1.4.12]
Change location of kubeconfig file for multi-cluster support. Put the
file in a subdirectory so that the k8s volume mount does not require a
k8s:
executor: 'central_deployment_agent'
package_name: k8splugin
- package_version: 1.4.12
+ package_version: 1.4.13
data_types:
# ============LICENSE_END=========================================================
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-from .k8sclient import deploy, undeploy, is_available, scale, upgrade, rollback, execute_command_in_deployment
\ No newline at end of file
+from .k8sclient import deploy, undeploy, is_available, scale, upgrade, rollback, execute_command_in_deployment, parse_ports
\ No newline at end of file
)
return service
-def _parse_ports(port_list):
+def parse_ports(port_list):
'''
Parse the port list into a list of container ports (needed to create the container)
and to a set of port mappings to set up k8s services.
ext = client.ExtensionsV1beta1Api()
# Parse the port mapping
- container_ports, port_map = _parse_ports(kwargs.get("ports", []))
+ container_ports, port_map = parse_ports(kwargs.get("ports", []))
# Parse the volumes list into volumes and volume_mounts for the deployment
volumes, volume_mounts = _parse_volumes(kwargs.get("volumes",[]))
**_setup_for_discovery(
**create_inputs))
-
-def _lookup_service(service_component_name, consul_host=CONSUL_HOST,
- with_port=False):
- conn = dis.create_kv_conn(consul_host)
- results = dis.lookup_service(conn, service_component_name)
-
- if with_port:
- # Just grab first
- result = results[0]
- return "{address}:{port}".format(address=result["ServiceAddress"],
- port=result["ServicePort"])
- else:
- return results[0]["ServiceAddress"]
-
def _verify_k8s_deployment(location, service_component_name, max_wait):
"""Verify that the k8s Deployment is ready
# TODO: Should NOT be setting up the delivery url with ip addresses
# because in the https case, this will not work because data router does
# a certificate validation using the fqdn.
- subscriber_host = _lookup_service(service_component_name, with_port=True)
+ ports,_ = k8sclient.parse_ports(kwargs["ports"])
+ (dport, _) = ports[0]
+ # Using service_component_name as the host name in the subscriber URL
+ # will work in a single-cluster ONAP deployment. Whether it will also work
+ # in a multi-cluster ONAP deployment--with a central location and one or
+ # more remote ("edge") locations depends on how networking and DNS is set
+ # up in a multi-cluster deployment
+ subscriber_host = "{host}:{port}".format(host=service_component_name, port=dport)
for dr_sub in dr_subs:
scheme = dr_sub["scheme"] if "scheme" in dr_sub else DEFAULT_SCHEME
<groupId>org.onap.dcaegen2.platform.plugins</groupId>
<artifactId>k8s</artifactId>
<name>k8s-plugin</name>
- <version>1.4.12-SNAPSHOT</version>
+ <version>1.4.13-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
setup(
name='k8splugin',
description='Cloudify plugin for containerized components deployed using Kubernetes',
- version="1.4.12",
+ version="1.4.13",
author='J. F. Lucas, Michael Hwang, Tommy Carpenter',
packages=['k8splugin','k8sclient','msb','configure'],
zip_safe=False,
_parse_interval(interval)
def test_parse_ports():
- from k8sclient.k8sclient import _parse_ports
+ from k8sclient.k8sclient import parse_ports
good_ports = [{"in": input, "ex": expected}
for (input, expected) in [
}
for test_case in good_ports:
- container_ports, port_map = _parse_ports([test_case["in"]])
+ container_ports, port_map = parse_ports([test_case["in"]])
(cport, hport, proto) = test_case["ex"]
assert container_ports == [(cport, proto)]
assert port_map == {(cport, proto) : hport}
for port in bad_ports:
with pytest.raises(ValueError):
- _parse_ports([port])
+ parse_ports([port])
- container_ports, port_map = _parse_ports(port_list)
+ container_ports, port_map = parse_ports(port_list)
assert port_map == expected_port_map
def test_create_container():
with pytest.raises(NonRecoverableError):
tasks._setup_for_discovery_streams(**test_input)
-
-def test_lookup_service(monkeypatch, mockconfig):
- import k8splugin
- from k8splugin import tasks
- def fake_lookup(conn, scn):
- return [{"ServiceAddress": "192.168.1.1", "ServicePort": "80"}]
-
- monkeypatch.setattr(k8splugin.discovery, "lookup_service",
- fake_lookup)
-
- assert "192.168.1.1" == tasks._lookup_service("some-component")
- assert "192.168.1.1:80" == tasks._lookup_service("some-component",
- with_port=True)
-
-
def test_verify_container(monkeypatch, mockconfig):
import k8sclient
from k8splugin import tasks
{'type': 'data_router', 'name': 'feed01', 'username': 'hero',
'password': '123456', 'location': 'Bedminster',
'route': 'some-path'}],
- 'topic01': {'type': 'message_router', 'name': 'topic01'}}
+ 'topic01': {'type': 'message_router', 'name': 'topic01'},
+ 'ports': ['8080/tcp:0']}
test_input["service_component_name"] = "some-foo-service-component"
- def fake_lookup_service(name, with_port=False):
- if with_port:
- return "10.100.1.100:8080"
- else:
- return
-
- monkeypatch.setattr(k8splugin.tasks, "_lookup_service",
- fake_lookup_service)
-
expected = copy.deepcopy(test_input)
- expected["feed01"]["delivery_url"] = "http://10.100.1.100:8080/some-path"
+ expected["feed01"]["delivery_url"] = "http://some-foo-service-component:8080/some-path"
assert tasks._update_delivery_url(**test_input) == expected
Code Review / dcaegen2 / platform / plugins.git / commitdiff