Introduce CNI plugin for Zun
The CNI plugin is an executable that interacts with the Zun CNI daemon. Implements: blueprint support-cni Change-Id: Iafc8a12bec04136b0c50aedb4ea7789af324f39d
This commit is contained in:
parent
48d7d617c3
commit
f5286b90c5
@ -46,6 +46,7 @@ console_scripts =
|
|||||||
zun-wsproxy = zun.cmd.wsproxy:main
|
zun-wsproxy = zun.cmd.wsproxy:main
|
||||||
zun-rootwrap = oslo_rootwrap.cmd:main
|
zun-rootwrap = oslo_rootwrap.cmd:main
|
||||||
zun-status = zun.cmd.status:main
|
zun-status = zun.cmd.status:main
|
||||||
|
zun-cni = zun.cni.cmd.cni:main
|
||||||
zun-cni-daemon = zun.cni.cmd.cni_daemon:main
|
zun-cni-daemon = zun.cni.cmd.cni_daemon:main
|
||||||
wsgi_scripts =
|
wsgi_scripts =
|
||||||
zun-api-wsgi = zun.api.wsgi:init_application
|
zun-api-wsgi = zun.api.wsgi:init_application
|
||||||
|
170
zun/cni/api.py
Normal file
170
zun/cni/api.py
Normal file
@ -0,0 +1,170 @@
|
|||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import abc
|
||||||
|
import requests
|
||||||
|
import traceback
|
||||||
|
|
||||||
|
from os_vif.objects import base
|
||||||
|
from oslo_config import cfg
|
||||||
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
|
import six
|
||||||
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
|
from zun.common import consts
|
||||||
|
from zun.common import exception
|
||||||
|
from zun.common.i18n import _
|
||||||
|
|
||||||
|
|
||||||
|
LOG = logging.getLogger(__name__)
|
||||||
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
||||||
|
@six.add_metaclass(abc.ABCMeta)
|
||||||
|
class CNIRunner(object):
|
||||||
|
# TODO(ivc): extend SUPPORTED_VERSIONS and format output based on
|
||||||
|
# requested params.CNI_VERSION and/or params.config.cniVersion
|
||||||
|
VERSION = '0.3.1'
|
||||||
|
SUPPORTED_VERSIONS = ['0.3.1']
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def _add(self, params):
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def _delete(self, params):
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
def _write_dict(self, fout, dct):
|
||||||
|
output = {'cniVersion': self.VERSION}
|
||||||
|
output.update(dct)
|
||||||
|
LOG.debug("CNI output: %s", output)
|
||||||
|
jsonutils.dump(output, fout, sort_keys=True)
|
||||||
|
|
||||||
|
def _write_exception(self, fout, msg):
|
||||||
|
self._write_dict(fout, {
|
||||||
|
'msg': msg,
|
||||||
|
'code': consts.CNI_EXCEPTION_CODE,
|
||||||
|
'details': traceback.format_exc(),
|
||||||
|
})
|
||||||
|
|
||||||
|
def _write_version(self, fout):
|
||||||
|
self._write_dict(fout, {'supportedVersions': self.SUPPORTED_VERSIONS})
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def prepare_env(self, env, stdin):
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
@abc.abstractmethod
|
||||||
|
def get_container_id(self, params):
|
||||||
|
raise NotImplementedError()
|
||||||
|
|
||||||
|
def run(self, env, fin, fout):
|
||||||
|
try:
|
||||||
|
# Prepare params according to calling Object
|
||||||
|
params = self.prepare_env(env, fin)
|
||||||
|
if env.get('CNI_COMMAND') == 'ADD':
|
||||||
|
vif = self._add(params)
|
||||||
|
self._write_dict(fout, vif)
|
||||||
|
elif env.get('CNI_COMMAND') == 'DEL':
|
||||||
|
self._delete(params)
|
||||||
|
elif env.get('CNI_COMMAND') == 'VERSION':
|
||||||
|
self._write_version(fout)
|
||||||
|
else:
|
||||||
|
raise exception.CNIError(
|
||||||
|
_("unknown CNI_COMMAND: %s"), env['CNI_COMMAND'])
|
||||||
|
return 0
|
||||||
|
except Exception as ex:
|
||||||
|
# LOG.exception
|
||||||
|
self._write_exception(fout, str(ex))
|
||||||
|
return 1
|
||||||
|
|
||||||
|
def _vif_data(self, vif, params):
|
||||||
|
result = {}
|
||||||
|
nameservers = []
|
||||||
|
|
||||||
|
cni_ip_list = result.setdefault("ips", [])
|
||||||
|
cni_routes_list = result.setdefault("routes", [])
|
||||||
|
result["interfaces"] = [
|
||||||
|
{
|
||||||
|
"name": params["CNI_IFNAME"],
|
||||||
|
"mac": vif.address,
|
||||||
|
"sandbox": self.get_container_id(params)}]
|
||||||
|
for subnet in vif.network.subnets.objects:
|
||||||
|
cni_ip = {}
|
||||||
|
nameservers.extend(subnet.dns)
|
||||||
|
|
||||||
|
ip = subnet.ips.objects[0].address
|
||||||
|
|
||||||
|
cni_ip['version'] = str(ip.version)
|
||||||
|
cni_ip['address'] = "%s/%s" % (ip, subnet.cidr.prefixlen)
|
||||||
|
cni_ip['interface'] = len(result["interfaces"]) - 1
|
||||||
|
|
||||||
|
if hasattr(subnet, 'gateway'):
|
||||||
|
cni_ip['gateway'] = str(subnet.gateway)
|
||||||
|
|
||||||
|
if subnet.routes.objects:
|
||||||
|
routes = [
|
||||||
|
{'dst': str(route.cidr), 'gw': str(route.gateway)}
|
||||||
|
for route in subnet.routes.objects]
|
||||||
|
cni_routes_list.extend(routes)
|
||||||
|
cni_ip_list.append(cni_ip)
|
||||||
|
|
||||||
|
if nameservers:
|
||||||
|
result['dns'] = {'nameservers': nameservers}
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
class CNIDaemonizedRunner(CNIRunner):
|
||||||
|
|
||||||
|
def _add(self, params):
|
||||||
|
resp = self._make_request('addNetwork', params, httplib.ACCEPTED)
|
||||||
|
vif = base.VersionedObject.obj_from_primitive(resp.json())
|
||||||
|
return self._vif_data(vif, params)
|
||||||
|
|
||||||
|
def _delete(self, params):
|
||||||
|
self._make_request('delNetwork', params, httplib.NO_CONTENT)
|
||||||
|
|
||||||
|
def prepare_env(self, env, stdin):
|
||||||
|
cni_envs = {}
|
||||||
|
cni_envs.update(
|
||||||
|
{k: v for k, v in env.items() if k.startswith('CNI_')})
|
||||||
|
cni_envs['config_zun'] = dict(stdin)
|
||||||
|
return cni_envs
|
||||||
|
|
||||||
|
def get_container_id(self, params):
|
||||||
|
return params["CNI_CONTAINERID"]
|
||||||
|
|
||||||
|
def _make_request(self, path, cni_envs, expected_status=None):
|
||||||
|
method = 'POST'
|
||||||
|
|
||||||
|
host = CONF.cni_daemon.cni_daemon_host
|
||||||
|
port = CONF.cni_daemon.cni_daemon_port
|
||||||
|
url = 'http://%s:%s/%s' % (host, port, path)
|
||||||
|
try:
|
||||||
|
LOG.debug('Making request to CNI Daemon. %(method)s %(path)s\n'
|
||||||
|
'%(body)s',
|
||||||
|
{'method': method, 'path': url, 'body': cni_envs})
|
||||||
|
resp = requests.post(url, json=cni_envs,
|
||||||
|
headers={'Connection': 'close'})
|
||||||
|
except requests.ConnectionError:
|
||||||
|
LOG.exception('Looks like %s:%s cannot be reached. '
|
||||||
|
'Is zun-cni-daemon running?', (host, port))
|
||||||
|
raise
|
||||||
|
LOG.debug('CNI Daemon returned "%(status)d %(reason)s".',
|
||||||
|
{'status': resp.status_code, 'reason': resp.reason})
|
||||||
|
if expected_status and resp.status_code != expected_status:
|
||||||
|
LOG.error('CNI daemon returned error "%(status)d %(reason)s".',
|
||||||
|
{'status': resp.status_code, 'reason': resp.reason})
|
||||||
|
raise exception.CNIError('Got invalid status code from CNI daemon')
|
||||||
|
return resp
|
70
zun/cni/cmd/cni.py
Normal file
70
zun/cni/cmd/cni.py
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import os
|
||||||
|
import signal
|
||||||
|
import six
|
||||||
|
import sys
|
||||||
|
|
||||||
|
import os_vif
|
||||||
|
from oslo_config import cfg
|
||||||
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
|
from zun.cni import api as cni_api
|
||||||
|
from zun.cni import utils
|
||||||
|
from zun.common import config
|
||||||
|
from zun.common import consts
|
||||||
|
|
||||||
|
|
||||||
|
CONF = cfg.CONF
|
||||||
|
LOG = logging.getLogger(__name__)
|
||||||
|
_CNI_TIMEOUT = 180
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
if six.PY3:
|
||||||
|
d = jsonutils.load(sys.stdin.buffer)
|
||||||
|
else:
|
||||||
|
d = jsonutils.load(sys.stdin)
|
||||||
|
cni_conf = utils.CNIConfig(d)
|
||||||
|
args = (['--config-file', cni_conf.zun_conf] if 'zun_conf' in d
|
||||||
|
else [])
|
||||||
|
|
||||||
|
try:
|
||||||
|
if cni_conf.debug:
|
||||||
|
args.append('-d')
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
config.init(args)
|
||||||
|
if os.environ.get('CNI_COMMAND') == 'VERSION':
|
||||||
|
CONF.set_default('use_stderr', True)
|
||||||
|
|
||||||
|
# Initialize o.vo registry.
|
||||||
|
os_vif.initialize()
|
||||||
|
|
||||||
|
runner = cni_api.CNIDaemonizedRunner()
|
||||||
|
|
||||||
|
def _timeout(signum, frame):
|
||||||
|
runner._write_dict(sys.stdout, {
|
||||||
|
'msg': 'timeout',
|
||||||
|
'code': consts.CNI_TIMEOUT_CODE,
|
||||||
|
})
|
||||||
|
LOG.debug('timed out')
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
signal.signal(signal.SIGALRM, _timeout)
|
||||||
|
signal.alarm(_CNI_TIMEOUT)
|
||||||
|
status = runner.run(os.environ, cni_conf, sys.stdout)
|
||||||
|
LOG.debug("Exiting with status %s", status)
|
||||||
|
if status:
|
||||||
|
sys.exit(status)
|
Loading…
x
Reference in New Issue
Block a user