Просмотр исходного кода

Fix NoneType instance_scripts calls

Gabriel-Adrian Samfira 6 лет назад
Родитель
Сommit
e5a88b82da
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 1
      coriolis/api/v1/migrations.py
  2. 1 0
      coriolis/conductor/rpc/server.py

+ 1 - 1
coriolis/api/v1/migrations.py

@@ -98,7 +98,7 @@ class MigrationController(api_wsgi.Controller):
         migration_body = body.get("migration", {})
         context = req.environ['coriolis.context']
         context.can(migration_policies.get_migrations_policy_label("create"))
-        user_scripts = migration_body.get("user_scripts")
+        user_scripts = migration_body.get("user_scripts", {})
         replica_id = migration_body.get("replica_id")
         if replica_id:
             clone_disks = migration_body.get("clone_disks", True)

+ 1 - 0
coriolis/conductor/rpc/server.py

@@ -693,6 +693,7 @@ class ConductorServerEndpoint(object):
         return self.get_migration(ctxt, migration.id)
 
     def _get_instance_scripts(self, user_scripts, instance):
+        user_scripts = user_scripts or {}
         ret = {
             "global": user_scripts.get("global", {}),
             "instances": {},