consolidation of watcher

Change-Id: I9c82ef4d8a81af98afdfc34f5ad496bcade4af6a
2015-10-22 17:02:45 +02:00
parent 8c76c7fbef
commit 74160c5e78
140 changed files with 2991 additions and 1271 deletions
--- a/watcher/applier/api/applier.py
+++ b/watcher/applier/api/applier.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/api/command_mapper.py
+++ b/watcher/applier/api/command_mapper.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/api/messaging/applier_command.py
+++ b/watcher/applier/api/messaging/applier_command.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/api/primitive_command.py
+++ b/watcher/applier/api/primitive_command.py
@@ -1,11 +1,13 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
+# 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,
@@ -13,6 +15,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 from watcher.applier.api.promise import Promise


--- a/watcher/applier/api/promise.py
+++ b/watcher/applier/api/promise.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/command/hypervisor_state_command.py
+++ b/watcher/applier/framework/command/hypervisor_state_command.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/command/migrate_command.py
+++ b/watcher/applier/framework/command/migrate_command.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/command/nop_command.py
+++ b/watcher/applier/framework/command/nop_command.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
@@ -14,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 from watcher.applier.api.primitive_command import PrimitiveCommand
 from watcher.applier.api.promise import Promise

--- a/watcher/applier/framework/command/power_state_command.py
+++ b/watcher/applier/framework/command/power_state_command.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/command/wrapper/nova_wrapper.py
+++ b/watcher/applier/framework/command/wrapper/nova_wrapper.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
@@ -568,7 +570,7 @@ class NovaWrapper(object):
    def create_instance(self, hypervisor_id, inst_name="test", image_id=None,
                        flavor_name="m1.tiny",
                        sec_group_list=["default"],
-                        network_names_list=["private"], keypair_name="mykeys",
+                        network_names_list=["demo-net"], keypair_name="mykeys",
                        create_new_floating_ip=True,
                        block_device_mapping_v2=None):
        """This method creates a new instance.
@@ -623,15 +625,16 @@ class NovaWrapper(object):
                return
            net_obj = {"net-id": nic_id}
            net_list.append(net_obj)
-        s = self.nova.servers
-        instance = s.create(inst_name,
-                            image, flavor=flavor,
-                            key_name=keypair_name,
-                            security_groups=sec_group_list,
-                            nics=net_list,
-                            block_device_mapping_v2=block_device_mapping_v2,
-                            availability_zone="nova:" +
-                                              hypervisor_id)
+
+        instance = self.nova.servers. \
+            create(inst_name,
+                   image, flavor=flavor,
+                   key_name=keypair_name,
+                   security_groups=sec_group_list,
+                   nics=net_list,
+                   block_device_mapping_v2=block_device_mapping_v2,
+                   availability_zone="nova:" +
+                                     hypervisor_id)

        # Poll at 5 second intervals, until the status is no longer 'BUILD'
        if instance:
--- a/watcher/applier/framework/command_executor.py
+++ b/watcher/applier/framework/command_executor.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/default_applier.py
+++ b/watcher/applier/framework/default_applier.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
@@ -13,6 +15,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 from watcher.applier.api.applier import Applier
 from watcher.applier.framework.command_executor import CommandExecutor
 from watcher.objects import Action
--- a/watcher/applier/framework/default_command_mapper.py
+++ b/watcher/applier/framework/default_command_mapper.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
@@ -13,6 +15,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#


 from watcher.applier.api.command_mapper import CommandMapper
--- a/watcher/applier/framework/deploy_phase.py
+++ b/watcher/applier/framework/deploy_phase.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
@@ -13,6 +15,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 from watcher.openstack.common import log
 LOG = log.getLogger(__name__)

--- a/watcher/applier/framework/manager_applier.py
+++ b/watcher/applier/framework/manager_applier.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
@@ -13,6 +15,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
 from concurrent.futures import ThreadPoolExecutor

 from oslo_config import cfg
--- a/watcher/applier/framework/messaging/events.py
+++ b/watcher/applier/framework/messaging/events.py
@@ -1,11 +1,13 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
+# 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,
@@ -13,6 +15,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#

 from enum import Enum

--- a/watcher/applier/framework/messaging/launch_action_plan.py
+++ b/watcher/applier/framework/messaging/launch_action_plan.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/messaging/trigger_action_plan.py
+++ b/watcher/applier/framework/messaging/trigger_action_plan.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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
--- a/watcher/applier/framework/rpcapi.py
+++ b/watcher/applier/framework/rpcapi.py
@@ -1,6 +1,8 @@
 # -*- encoding: utf-8 -*-
 # Copyright (c) 2015 b<>com
 #
+# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
+#
 # 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