Licenses added

conductor/bin/conductor

@@ -1,20 +1,17 @@
-#!/usr/bin/env python
+# Copyright (c) 2013 Mirantis Inc.
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack LLC.
-# All Rights Reserved.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+# Licensed under the Apache License, Version 2.0 (the "License");
-#    not use this file except in compliance with the License. You may obtain
+# you may not use this file except in compliance with the License.
-#    a copy of the License at
+# You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless required by applicable law or agreed to in writing, software
+# Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# distributed under the License is distributed on an "AS IS" BASIS,
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-#    License for the specific language governing permissions and limitations
+# implied.
-#    under the License.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import sys
 

conductor/conductor/app.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 datetime
 import glob
 import sys

conductor/conductor/cloud_formation.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 base64
 
 import xml_code_engine
@@ -29,7 +44,8 @@ def delete_cf_stack(engine, context, body, **kwargs):
         name='cf', command='Delete', callback=callback)
 
 
-def prepare_user_data(context, hostname, service, unit, template='Default', **kwargs):
+def prepare_user_data(context, hostname, service, unit,
+                      template='Default', **kwargs):
     settings = config.CONF.rabbitmq
 
     with open('data/init.ps1') as init_script_file:
@@ -59,7 +75,6 @@ def prepare_user_data(context, hostname, service, unit, template='Default', **kw
 
 counter = 0
 
-
 def int2base(x, base):
     digs = string.digits + string.lowercase
     if x < 0: sign = -1

conductor/conductor/commands/__init__.py

@@ -1 +1,16 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 command

conductor/conductor/commands/cloud_formation.py

@@ -1,7 +1,23 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 anyjson
 import eventlet
-
+import types
 import jsonpath
+
 from conductor.openstack.common import log as logging
 import conductor.helpers
 from command import CommandBase
@@ -9,7 +25,6 @@ import conductor.config
 from heatclient.client import Client
 import heatclient.exc
 from keystoneclient.v2_0 import client as ksclient
-import types
 
 log = logging.getLogger(__name__)
 
@@ -28,11 +43,15 @@ class HeatExecutor(CommandBase):
 
         scoped_token = auth_data.id
 
-        heat_url = jsonpath.jsonpath(auth_data.serviceCatalog,
+        heat_url = jsonpath.jsonpath(
+            auth_data.serviceCatalog,
             "$[?(@.name == 'heat')].endpoints[0].publicURL")[0]
 
-        self._heat_client = Client('1', heat_url,
+        self._heat_client = Client(
-            token_only=True, token=scoped_token)
+            '1',
+            heat_url,
+            token_only=True,
+            token=scoped_token)
 
     def execute(self, command, callback, **kwargs):
         log.debug('Got command {0} on stack {1}'.format(command, self._stack))

conductor/conductor/commands/command.py

@@ -1,3 +1,19 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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.
+
+
 class CommandBase(object):
     def execute(self, **kwargs):
         pass

conductor/conductor/commands/dispatcher.py

@@ -1,14 +1,29 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 command
 import cloud_formation
 import windows_agent
 
 
 class CommandDispatcher(command.CommandBase):
-    def __init__(self, environment_id, rmqclient, token, tenant_id):
+    def __init__(self, environment, rmqclient, token, tenant_id):
         self._command_map = {
-            'cf': cloud_formation.HeatExecutor(environment_id, token, tenant_id),
+            'cf': cloud_formation.HeatExecutor(environment, token, tenant_id),
             'agent': windows_agent.WindowsAgentExecutor(
-                environment_id, rmqclient)
+                environment, rmqclient)
         }
 
     def execute(self, name, **kwargs):

conductor/conductor/config.py

@@ -1,6 +1,3 @@
-#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #

conductor/conductor/function_context.py

@@ -1,3 +1,19 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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.
+
+
 class Context(object):
     def __init__(self, parent=None):
         self._parent = parent

conductor/conductor/helpers.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 types
 
 

conductor/conductor/rabbitmq.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 eventlet import patcher
 puka = patcher.import_patched('puka')
 #import puka
@@ -97,7 +112,6 @@ class Subscription(object):
                 "Subscription object must be used within 'with' block")
         self._ack_last()
         self._lastMessage = self._client.wait(self._promise, timeout=timeout)
-        #print self._lastMessage
         msg = Message()
         msg.body = anyjson.loads(self._lastMessage['body'])
         msg.id = self._lastMessage['headers'].get('message_id')

conductor/conductor/reporting.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 xml_code_engine
 import rabbitmq
 

conductor/conductor/version.py

@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 #    Copyright 2012 OpenStack Foundation
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may

conductor/conductor/windows_agent.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 xml_code_engine
 
 from openstack.common import log as logging

conductor/conductor/workflow.py

@@ -1,3 +1,18 @@
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 jsonpath
 import types
 import re
@@ -124,9 +139,6 @@ class Workflow(object):
     def _rule_func(match, context, body, engine, limit=0, name=None, **kwargs):
         position = context['__dataSource_currentPosition'] or []
 
-        # data = context['__dataSource_currentObj']
-        # if data is None:
-        #     data = context['/dataSource']
         position, match = Workflow._get_relative_position(match, context)
         data = Workflow._get_path(context['/dataSource'], position)
         match = re.sub(r'@\.([\w.]+)',

conductor/conductor/xml_code_engine.py

@@ -1,4 +1,18 @@
-#from lxml import etree
+# Copyright (c) 2013 Mirantis Inc.
+#
+# 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 xml.etree.ElementTree as etree
 import types
 
@@ -121,15 +135,3 @@ XmlCodeEngine.register_function(_function_func, "function")
 XmlCodeEngine.register_function(_null_func, "null")
 XmlCodeEngine.register_function(_true_func, "true")
 XmlCodeEngine.register_function(_false_func, "false")
-
-
-def xprint(context, body, **kwargs):
-    print "------------------------ start ------------------------"
-    for arg in kwargs:
-        print "%s = %s" % (arg, kwargs[arg])
-    print 'context = ', context
-    print 'body = %s (%s)' % (body, body.text)
-    print "------------------------- end -------------------------"
-
-
-XmlCodeEngine.register_function(xprint, "print")