Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9FEC4200AE4 for ; Wed, 11 May 2016 04:48:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9E8BF160A11; Wed, 11 May 2016 02:48:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E864E16098A for ; Wed, 11 May 2016 04:48:11 +0200 (CEST) Received: (qmail 91130 invoked by uid 500); 11 May 2016 02:48:11 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 91119 invoked by uid 99); 11 May 2016 02:48:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 May 2016 02:48:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CFC7DFD43; Wed, 11 May 2016 02:48:10 +0000 (UTC) From: jburwell To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org References: In-Reply-To: Subject: [GitHub] cloudstack pull request: OSPF: adding dynamically routing capabili... Content-Type: text/plain Message-Id: <20160511024810.9CFC7DFD43@git1-us-west.apache.org> Date: Wed, 11 May 2016 02:48:10 +0000 (UTC) archived-at: Wed, 11 May 2016 02:48:12 -0000 Github user jburwell commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1371#discussion_r62785361 --- Diff: systemvm/patches/debian/config/opt/cloud/bin/cs/CsQuagga.py --- @@ -0,0 +1,85 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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 logging +import os.path +import re +from cs.CsDatabag import CsDataBag +from CsProcess import CsProcess +from CsFile import CsFile +import CsHelper + +OSPFD_CONF = "/etc/quagga/ospfd.conf" +OSPFD_CONF_NEW = "/etc/quagga/ospfd.conf.new" +ZEBRA_CONF = "/etc/quagga/zebra.conf" +ZEBRA_CONF_NEW = "/etc/quagga/zebra.conf.new" + + +class CsQuagga(CsDataBag): + """ Manage Load Balancer entries """ + + def process(self): + #create quagga config + logging.debug("CsQuagga: zebra" + str(self.dbag["zebra_config"])) + logging.debug("CsQuagga: ospfd" + str(self.dbag["ospf_config"])) + + zebra_config = self.dbag["zebra_config"].split(',') + ospf_config = self.dbag["ospf_config"].split(',') + changed = False + #process zebra + zebra_conf_new = CsFile(ZEBRA_CONF_NEW) + zebra_conf_new.empty() + for x in zebra_config: + [zebra_conf_new.append(w, -1) for w in x.split('\n')] + + zebra_conf_new.commit() + zebra_conf = CsFile(ZEBRA_CONF) + if not zebra_conf.compare(zebra_conf_new): + CsHelper.copy(ZEBRA_CONF_NEW, ZEBRA_CONF) + changed = True + + #process ospfd + ospfd_conf_new = CsFile(OSPFD_CONF_NEW) + ospfd_conf_new.empty() + for x in ospf_config: + [ospfd_conf_new.append(w, -1) for w in x.split('\n')] + + ospfd_conf_new.commit() + ospfd_conf = CsFile(OSPFD_CONF) + if not ospfd_conf.compare(ospfd_conf_new): + CsHelper.copy(OSPFD_CONF_NEW, OSPFD_CONF) + changed = True + + if changed: + #reset zebra and quagga + proc = CsProcess(['/var/run/quagga.pid']) + logging.debug("CsQuagga: Resetted quagga ") + if not proc.find(): + logging.debug("CsQuagga:: will restart Quagga!") + CsHelper.service("quagga", "restart") + else: + logging.debug("CsQuagga:: will reload Quagga!") + CsHelper.service("quagga", "reload") --- End diff -- Where is zebra restarted? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---