diff --git a/akanda/__init__.py b/akanda/__init__.py index 0f218ac..59a5c81 100644 --- a/akanda/__init__.py +++ b/akanda/__init__.py @@ -1,23 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC -# -# 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. - - -# Copyright 2014 DreamHost, LLC -# -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 diff --git a/akanda/neutron/__init__.py b/akanda/neutron/__init__.py index 9a0fd31..63621ff 100644 --- a/akanda/neutron/__init__.py +++ b/akanda/neutron/__init__.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -13,5 +13,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - - diff --git a/akanda/neutron/db/__init__.py b/akanda/neutron/db/__init__.py index 9a0fd31..63621ff 100644 --- a/akanda/neutron/db/__init__.py +++ b/akanda/neutron/db/__init__.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -13,5 +13,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - - diff --git a/akanda/neutron/db/models_v2.py b/akanda/neutron/db/models_v2.py index 29f49fb..f9d36db 100644 --- a/akanda/neutron/db/models_v2.py +++ b/akanda/neutron/db/models_v2.py @@ -1,6 +1,7 @@ -# Copyright 2014 DreamHost, LLC +# Copyright (c) 2012 OpenStack, LLC. +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -15,26 +16,6 @@ # under the License. -# Copyright (c) 2012 OpenStack, LLC. -# -# 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. -# -# DreamHost Neutron Extensions -# Copyright 2012 New Dream Network, LLC (DreamHost) -# @author: Murali Raju, New Dream Network, LLC (DreamHost) -# @author: Mark Mcclain, New Dream Network, LLC (DreamHost) - from datetime import datetime import netaddr diff --git a/akanda/neutron/extensions/__init__.py b/akanda/neutron/extensions/__init__.py index 9a0fd31..63621ff 100644 --- a/akanda/neutron/extensions/__init__.py +++ b/akanda/neutron/extensions/__init__.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -13,5 +13,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - - diff --git a/akanda/neutron/extensions/_authzbase.py b/akanda/neutron/extensions/_authzbase.py index 96af91a..5b05b7c 100644 --- a/akanda/neutron/extensions/_authzbase.py +++ b/akanda/neutron/extensions/_authzbase.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,26 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# Copyright 2012 New Dream Network, LLC (DreamHost) -# -# 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. -# -# DreamHost Neutron Extensions -# @author: Murali Raju, New Dream Network, LLC (DreamHost) -# @author: Mark Mcclain, New Dream Network, LLC (DreamHost) - import abc from neutron import quota diff --git a/akanda/neutron/extensions/addressentry.py b/akanda/neutron/extensions/addressentry.py index a6d6103..b944dbe 100644 --- a/akanda/neutron/extensions/addressentry.py +++ b/akanda/neutron/extensions/addressentry.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,26 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# Copyright 2012 New Dream Network, LLC (DreamHost) -# -# 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. -# -# DreamHost Neutron Extensions -# @author: Murali Raju, New Dream Network, LLC (DreamHost) -# @author: Mark Mcclain, New Dream Network, LLC (DreamHost) - import logging from neutron.api import extensions diff --git a/akanda/neutron/extensions/addressgroup.py b/akanda/neutron/extensions/addressgroup.py index baee904..ae7a802 100644 --- a/akanda/neutron/extensions/addressgroup.py +++ b/akanda/neutron/extensions/addressgroup.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -15,25 +15,6 @@ # under the License. -# Copyright 2012 New Dream Network, LLC (DreamHost) -# -# 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. -# -# DreamHost Neutron Extensions -# @author: Murali Raju, New Dream Network, LLC (DreamHost) -# @author: Mark Mcclain, New Dream Network, LLC (DreamHost) - from neutron.api import extensions from neutron.api.v2 import attributes from neutron.common import exceptions diff --git a/akanda/neutron/extensions/filterrule.py b/akanda/neutron/extensions/filterrule.py index 758420c..f61826b 100644 --- a/akanda/neutron/extensions/filterrule.py +++ b/akanda/neutron/extensions/filterrule.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,26 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# Copyright 2012 New Dream Network, LLC (DreamHost) -# -# 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. -# -# DreamHost Neutron Extensions -# @author: Murali Raju, New Dream Network, LLC (DreamHost) -# @author: Mark Mcclain, New Dream Network, LLC (DreamHost) - from neutron.api import extensions from neutron.api.v2 import attributes from neutron.common import exceptions as q_exc diff --git a/akanda/neutron/extensions/portalias.py b/akanda/neutron/extensions/portalias.py index 574fdcf..6a7bbd8 100644 --- a/akanda/neutron/extensions/portalias.py +++ b/akanda/neutron/extensions/portalias.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,26 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# Copyright 2012 New Dream Network, LLC (DreamHost) -# -# 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. -# -# DreamHost Neutron Extensions -# @author: Murali Raju, New Dream Network, LLC (DreamHost) - - from neutron.api import extensions from neutron.api.v2 import attributes from neutron.common import exceptions diff --git a/akanda/neutron/extensions/portforward.py b/akanda/neutron/extensions/portforward.py index a6f211c..2040a7d 100644 --- a/akanda/neutron/extensions/portforward.py +++ b/akanda/neutron/extensions/portforward.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,26 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# Copyright 2012 New Dream Network, LLC (DreamHost) -# -# 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. -# -# DreamHost Neutron Extensions -# @author: Murali Raju, New Dream Network, LLC (DreamHost) -# @author: Mark Mcclain, New Dream Network, LLC (DreamHost) - from sqlalchemy.orm import exc from neutron.api import extensions diff --git a/akanda/neutron/plugins/__init__.py b/akanda/neutron/plugins/__init__.py index 9a0fd31..63621ff 100644 --- a/akanda/neutron/plugins/__init__.py +++ b/akanda/neutron/plugins/__init__.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -13,5 +13,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - - diff --git a/akanda/neutron/plugins/decorators.py b/akanda/neutron/plugins/decorators.py index ed876a7..e9c2473 100644 --- a/akanda/neutron/plugins/decorators.py +++ b/akanda/neutron/plugins/decorators.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 diff --git a/akanda/neutron/plugins/floatingip.py b/akanda/neutron/plugins/floatingip.py index 3258c8d..19d4ec8 100644 --- a/akanda/neutron/plugins/floatingip.py +++ b/akanda/neutron/plugins/floatingip.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 diff --git a/akanda/neutron/plugins/nvp_neutron_plugin.py b/akanda/neutron/plugins/nvp_neutron_plugin.py index 0b42898..8952a28 100644 --- a/akanda/neutron/plugins/nvp_neutron_plugin.py +++ b/akanda/neutron/plugins/nvp_neutron_plugin.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,25 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 New Dream Network, LLC (DreamHost) -# All Rights Reserved -# -# 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 functools from neutron.common import topics diff --git a/akanda/neutron/plugins/ovs_neutron_plugin.py b/akanda/neutron/plugins/ovs_neutron_plugin.py index 64b987c..93b72f7 100644 --- a/akanda/neutron/plugins/ovs_neutron_plugin.py +++ b/akanda/neutron/plugins/ovs_neutron_plugin.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -14,25 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. - -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 New Dream Network, LLC (DreamHost) -# All Rights Reserved -# -# 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. -# - from neutron.plugins.openvswitch import ovs_neutron_plugin from akanda.neutron.plugins import decorators as akanda diff --git a/scripts/rabbit.py b/scripts/rabbit.py index df25f3d..97b7cc2 100644 --- a/scripts/rabbit.py +++ b/scripts/rabbit.py @@ -1,6 +1,8 @@ -# Copyright 2014 DreamHost, LLC +#!/usr/bin/env python + +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 @@ -15,59 +17,41 @@ # under the License. -# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Usage: python rabbit.py '#' # -# 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 pika +import sys +credentials = pika.PlainCredentials('guest', 'yetanothersecret') +connection = pika.BlockingConnection(pika.ConnectionParameters + (host='192.168.57.100', + credentials=credentials)) +channel = connection.channel() + +channel.exchange_declare(exchange='quantum', + type='topic') + +result = channel.queue_declare(exclusive=False) +queue_name = result.method.queue + +binding_keys = sys.argv[1:] +if not binding_keys: + print >> sys.stderr, "Usage: %s [binding_key]..." % (sys.argv[0],) + sys.exit(1) + +for binding_key in binding_keys: + channel.queue_bind(exchange='quantum', + queue=queue_name, + routing_key=binding_key) + +print ' [*] Waiting for logs. To exit press CTRL+C' -#!/usr/bin/env python -# -# Usage: python rabbit.py '#' -# -import pika -import sys -credentials = pika.PlainCredentials('guest', 'yetanothersecret') -connection = pika.BlockingConnection(pika.ConnectionParameters - (host='192.168.57.100', - credentials=credentials)) -channel = connection.channel() - -channel.exchange_declare(exchange='quantum', - type='topic') - -result = channel.queue_declare(exclusive=False) -queue_name = result.method.queue - -binding_keys = sys.argv[1:] -if not binding_keys: - print >> sys.stderr, "Usage: %s [binding_key]..." % (sys.argv[0],) - sys.exit(1) - -for binding_key in binding_keys: - channel.queue_bind(exchange='quantum', - queue=queue_name, - routing_key=binding_key) - -print ' [*] Waiting for logs. To exit press CTRL+C' - - -def callback(ch, method, properties, body): - print " [x] %r:%r" % (method.routing_key, body,) - -channel.basic_consume(callback, - queue=queue_name, - no_ack=True) - -channel.start_consuming() +def callback(ch, method, properties, body): + print " [x] %r:%r" % (method.routing_key, body,) + +channel.basic_consume(callback, + queue=queue_name, + no_ack=True) + +channel.start_consuming() diff --git a/setup.py b/setup.py index 62c0cc2..bfce767 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 diff --git a/test/functional/scrubber.py b/test/functional/scrubber.py index 557a690..64c8d37 100644 --- a/test/functional/scrubber.py +++ b/test/functional/scrubber.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 diff --git a/test/functional/visibility.py b/test/functional/visibility.py index 289a2d6..ffa21c9 100644 --- a/test/functional/visibility.py +++ b/test/functional/visibility.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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 diff --git a/test/unit/test_placeholder.py b/test/unit/test_placeholder.py index da9267f..eac191b 100644 --- a/test/unit/test_placeholder.py +++ b/test/unit/test_placeholder.py @@ -1,6 +1,6 @@ -# Copyright 2014 DreamHost, LLC +# Copyright 2014 DreamHost, LLC # -# Author: DreamHost, LLC +# Author: DreamHost, LLC # # 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