Switch to uuidutils from oslo_utils library

Get rid of our copy of uuidutils.py from oslo-incubator

Change-Id: Idca3581475bcd4a04ce8d3420a1b7763db15b390

nova/api/ec2/ec2utils.py

@@ -19,6 +19,7 @@ import re
 
 from oslo_log import log as logging
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from nova import context
 from nova import exception
@@ -28,7 +29,6 @@ from nova.network import model as network_model
 from nova import objects
 from nova.objects import base as obj_base
 from nova.openstack.common import memorycache
-from nova.openstack.common import uuidutils
 
 LOG = logging.getLogger(__name__)
 # NOTE(vish): cache mapping for one week

nova/api/openstack/compute/contrib/floating_ips.py

@@ -16,6 +16,7 @@
 #    under the License.
 
 from oslo_log import log as logging
+from oslo_utils import uuidutils
 import webob
 
 from nova.api.openstack import common
@@ -27,7 +28,6 @@ from nova import exception
 from nova.i18n import _
 from nova.i18n import _LW
 from nova import network
-from nova.openstack.common import uuidutils
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/contrib/volumes.py

@@ -17,6 +17,7 @@
 
 from oslo_log import log as logging
 from oslo_utils import strutils
+from oslo_utils import uuidutils
 import webob
 from webob import exc
 
@@ -28,7 +29,6 @@ from nova import exception
 from nova.i18n import _
 from nova.i18n import _LI
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import volume
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/plugins/v3/floating_ips.py

@@ -16,6 +16,7 @@
 #    under the License.
 
 from oslo_log import log as logging
+from oslo_utils import uuidutils
 import webob
 
 from nova.api.openstack import common
@@ -29,7 +30,6 @@ from nova import exception
 from nova.i18n import _
 from nova.i18n import _LW
 from nova import network
-from nova.openstack.common import uuidutils
 
 
 LOG = logging.getLogger(__name__)

nova/api/openstack/compute/plugins/v3/servers.py

@@ -22,6 +22,7 @@ from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import strutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 import stevedore
 import webob
@@ -40,7 +41,6 @@ from nova.i18n import _
 from nova.i18n import _LW
 from nova.image import glance
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import policy
 from nova import utils
 

nova/api/openstack/compute/servers.py

@@ -25,6 +25,7 @@ import oslo_messaging as messaging
 from oslo_utils import netutils
 from oslo_utils import strutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 import webob
 from webob import exc
@@ -38,7 +39,6 @@ from nova.compute import flavors
 from nova import exception
 from nova.i18n import _
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import policy
 from nova import utils
 

nova/api/validation/validators.py

@@ -22,12 +22,12 @@ import re
 import jsonschema
 import netaddr
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import rfc3986
 import six
 
 from nova import exception
 from nova.i18n import _
-from nova.openstack.common import uuidutils
 
 
 @jsonschema.FormatChecker.cls_checks('date-time')

nova/cells/messaging.py

@@ -38,6 +38,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 
 from nova.cells import state as cells_state
@@ -55,7 +56,6 @@ from nova.i18n import _, _LE, _LI, _LW
 from nova.network import model as network_model
 from nova import objects
 from nova.objects import base as objects_base
-from nova.openstack.common import uuidutils
 from nova import rpc
 from nova import utils
 

nova/compute/api.py

@@ -33,6 +33,7 @@ from oslo_utils import excutils
 from oslo_utils import strutils
 from oslo_utils import timeutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 import six
 
 from nova import availability_zones
@@ -68,7 +69,6 @@ from nova.objects import block_device as block_device_obj
 from nova.objects import keypair as keypair_obj
 from nova.objects import quotas as quotas_obj
 from nova.objects import security_group as security_group_obj
-from nova.openstack.common import uuidutils
 from nova.pci import request as pci_request
 import nova.policy
 from nova import rpc

nova/console/api.py

@@ -16,11 +16,11 @@
 """Handles ConsoleProxy API requests."""
 
 from oslo_config import cfg
+from oslo_utils import uuidutils
 
 from nova.compute import rpcapi as compute_rpcapi
 from nova.console import rpcapi as console_rpcapi
 from nova.db import base
-from nova.openstack.common import uuidutils
 
 CONF = cfg.CONF
 CONF.import_opt('console_topic', 'nova.console.rpcapi')

nova/db/sqlalchemy/api.py

@@ -33,6 +33,7 @@ from oslo_db.sqlalchemy import utils as sqlalchemyutils
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import retrying
 import six
 from sqlalchemy import and_
@@ -61,7 +62,6 @@ import nova.context
 from nova.db.sqlalchemy import models
 from nova import exception
 from nova.i18n import _, _LI, _LE, _LW
-from nova.openstack.common import uuidutils
 from nova import quota
 
 db_opts = [

nova/keymgr/mock_key_mgr.py

@@ -29,12 +29,12 @@ this class.
 import array
 
 from oslo_log import log as logging
+from oslo_utils import uuidutils
 
 from nova import exception
 from nova.i18n import _LW
 from nova.keymgr import key
 from nova.keymgr import key_mgr
-from nova.openstack.common import uuidutils
 from nova import utils
 
 

nova/network/floating_ips.py

@@ -21,6 +21,7 @@ from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_utils import excutils
 from oslo_utils import importutils
+from oslo_utils import uuidutils
 import six
 
 from nova import context
@@ -29,7 +30,6 @@ from nova import exception
 from nova.i18n import _LE, _LI, _LW
 from nova.network import rpcapi as network_rpcapi
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import quota
 from nova import rpc
 from nova import servicegroup

nova/network/manager.py

@@ -42,6 +42,7 @@ from oslo_utils import importutils
 from oslo_utils import netutils
 from oslo_utils import strutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from nova import conductor
 from nova import context
@@ -58,7 +59,6 @@ from nova import objects
 from nova.objects import base as obj_base
 from nova.objects import quotas as quotas_obj
 from nova.openstack.common import periodic_task
-from nova.openstack.common import uuidutils
 from nova import servicegroup
 from nova import utils
 

nova/network/neutronv2/api.py

@@ -24,6 +24,7 @@ from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
+from oslo_utils import uuidutils
 import six
 
 from nova.api.openstack import extensions
@@ -34,7 +35,6 @@ from nova.network import base_api
 from nova.network import model as network_model
 from nova.network.neutronv2 import constants
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova.pci import manager as pci_manager
 from nova.pci import request as pci_request
 from nova.pci import whitelist as pci_whitelist

nova/network/security_group/neutron_driver.py

@@ -20,6 +20,7 @@ from neutronclient.neutron import v2_0 as neutronv20
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
+from oslo_utils import uuidutils
 import six
 from webob import exc
 
@@ -29,7 +30,6 @@ from nova.i18n import _, _LE, _LI, _LW
 from nova.network.neutronv2 import api as neutronapi
 from nova.network.security_group import security_group_base
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import utils
 
 

nova/objects/instance_group.py

@@ -12,13 +12,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import uuidutils
+
 from nova.compute import utils as compute_utils
 from nova import db
 from nova import exception
 from nova import objects
 from nova.objects import base
 from nova.objects import fields
-from nova.openstack.common import uuidutils
 from nova import utils
 
 

nova/openstack/common/uuidutils.py

@@ -1,37 +0,0 @@
-# Copyright (c) 2012 Intel Corporation.
-# 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.
-
-"""
-UUID related utilities and helper functions.
-"""
-
-import uuid
-
-
-def generate_uuid():
-    return str(uuid.uuid4())
-
-
-def is_uuid_like(val):
-    """Returns validation of a value as a UUID.
-
-    For our purposes, a UUID is a canonical form string:
-    aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
-
-    """
-    try:
-        return str(uuid.UUID(val)).lower() == val.lower()
-    except (TypeError, ValueError, AttributeError):
-        return False

nova/tests/unit/api/ec2/test_cloud.py

@@ -30,6 +30,7 @@ import mock
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from nova.api.ec2 import cloud
 from nova.api.ec2 import ec2utils
@@ -53,7 +54,6 @@ from nova.network.neutronv2 import api as neutronapi
 from nova import objects
 from nova.objects import base as obj_base
 from nova.openstack.common import policy as common_policy
-from nova.openstack.common import uuidutils
 from nova import policy
 from nova import test
 from nova.tests.unit.api.openstack.compute.contrib import (

nova/tests/unit/api/openstack/compute/admin_only_action_common.py

@@ -14,12 +14,12 @@
 
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import webob
 
 from nova.compute import vm_states
 import nova.context
 from nova import exception
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit import fake_instance
 

nova/tests/unit/api/openstack/compute/contrib/test_create_backup.py

@@ -13,12 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import uuidutils
+
 from nova.api.openstack import common
 from nova.api.openstack.compute.contrib import admin_actions as \
     create_backup_v2
 from nova.api.openstack.compute.plugins.v3 import create_backup as \
     create_backup_v21
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes

nova/tests/unit/api/openstack/compute/contrib/test_migrate_server.py

@@ -13,12 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import uuidutils
+
 from nova.api.openstack.compute.contrib import admin_actions as \
     migrate_server_v2
 from nova.api.openstack.compute.plugins.v3 import migrate_server as \
     migrate_server_v21
 from nova import exception
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit.api.openstack.compute import admin_only_action_common
 from nova.tests.unit.api.openstack import fakes

nova/tests/unit/api/openstack/compute/contrib/test_server_group_quotas.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from oslo_config import cfg
+from oslo_utils import uuidutils
 import webob
 
 from nova.api.openstack.compute.contrib import server_groups
@@ -21,7 +22,6 @@ from nova.api.openstack.compute.plugins.v3 import server_groups as sg_v3
 from nova.api.openstack import extensions
 from nova import context
 import nova.db
-from nova.openstack.common import uuidutils
 from nova import quota
 from nova import test
 from nova.tests.unit.api.openstack import fakes

nova/tests/unit/api/openstack/compute/contrib/test_server_groups.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_utils import uuidutils
 import webob
 
 from nova.api.openstack.compute.contrib import server_groups
@@ -22,7 +23,6 @@ from nova import context
 import nova.db
 from nova import exception
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 

nova/tests/unit/api/openstack/compute/contrib/test_server_reset_state.py

@@ -12,6 +12,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from oslo_utils import uuidutils
 import webob
 
 from nova.api.openstack.compute.contrib import admin_actions as \
@@ -21,7 +22,6 @@ from nova.api.openstack.compute.plugins.v3 import admin_actions as \
 from nova.compute import vm_states
 from nova import exception
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 

nova/tests/unit/api/openstack/compute/test_server_actions.py

@@ -19,6 +19,7 @@ import uuid
 import mock
 from mox3 import mox
 from oslo_config import cfg
+from oslo_utils import uuidutils
 import webob
 
 from nova.api.openstack.compute import plugins
@@ -31,7 +32,6 @@ from nova import db
 from nova import exception
 from nova.image import glance
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit.api.openstack import fakes
 from nova.tests.unit import fake_block_device

nova/tests/unit/cells/test_cells_messaging.py

@@ -25,6 +25,7 @@ from oslo_config import cfg
 import oslo_messaging
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from nova.cells import messaging
 from nova.cells import utils as cells_utils
@@ -38,7 +39,6 @@ from nova.network import model as network_model
 from nova import objects
 from nova.objects import base as objects_base
 from nova.objects import fields as objects_fields
-from nova.openstack.common import uuidutils
 from nova import rpc
 from nova import test
 from nova.tests.unit.cells import fakes

nova/tests/unit/cells/test_cells_scheduler.py

@@ -19,6 +19,7 @@ import copy
 import time
 
 from oslo_config import cfg
+from oslo_utils import uuidutils
 
 from nova import block_device
 from nova.cells import filters
@@ -29,7 +30,6 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova.scheduler import utils as scheduler_utils
 from nova import test
 from nova.tests.unit.cells import fakes

nova/tests/unit/compute/test_compute.py

@@ -36,6 +36,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 import six
 import testtools
 from testtools import matchers as testtools_matchers
@@ -66,7 +67,6 @@ from nova.network.security_group import openstack_driver
 from nova import objects
 from nova.objects import block_device as block_device_obj
 from nova.objects import instance as instance_obj
-from nova.openstack.common import uuidutils
 from nova import policy
 from nova import quota
 from nova import test

nova/tests/unit/compute/test_compute_api.py

@@ -21,6 +21,7 @@ import iso8601
 import mock
 from mox3 import mox
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from nova.compute import api as compute_api
 from nova.compute import arch
@@ -41,7 +42,6 @@ from nova import objects
 from nova.objects import base as obj_base
 from nova.objects import quotas as quotas_obj
 from nova.openstack.common import policy as common_policy
-from nova.openstack.common import uuidutils
 from nova import policy
 from nova import quota
 from nova import test

nova/tests/unit/compute/test_compute_mgr.py

@@ -24,6 +24,7 @@ from oslo_config import cfg
 import oslo_messaging as messaging
 from oslo_utils import importutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from nova.compute import build_results
 from nova.compute import manager
@@ -40,7 +41,6 @@ from nova.network import api as network_api
 from nova.network import model as network_model
 from nova import objects
 from nova.objects import block_device as block_device_obj
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit.compute import fake_resource_tracker
 from nova.tests.unit import fake_block_device

nova/tests/unit/db/test_db_api.py

@@ -32,6 +32,7 @@ from oslo_db.sqlalchemy import test_base
 from oslo_db.sqlalchemy import utils as sqlalchemyutils
 from oslo_serialization import jsonutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 from sqlalchemy import Column
 from sqlalchemy.dialects import sqlite
@@ -56,7 +57,6 @@ from nova.db.sqlalchemy import utils as db_utils
 from nova import exception
 from nova import objects
 from nova.objects import base as obj_base
-from nova.openstack.common import uuidutils
 from nova import quota
 from nova import test
 from nova.tests.unit import matchers

nova/tests/unit/test_api_validation.py

@@ -783,10 +783,10 @@ class UuidTestCase(APIValidationTestCase):
 
     def test_validate_uuid_fails(self):
         detail = ("Invalid input for field/attribute foo."
-                  " Value: 70a599e031e749b7b260868f441e862b."
-                  " '70a599e031e749b7b260868f441e862b' is not a 'uuid'")
+                  " Value: 70a599e031e749b7b260868f441e862."
+                  " '70a599e031e749b7b260868f441e862' is not a 'uuid'")
         self.check_validation_error(self.post,
-            body={'foo': '70a599e031e749b7b260868f441e862b'},
+            body={'foo': '70a599e031e749b7b260868f441e862'},
             expected_detail=detail)
 
         detail = ("Invalid input for field/attribute foo. Value: 1."

nova/tests/unit/virt/ironic/test_driver.py

@@ -19,6 +19,7 @@ from ironicclient import exc as ironic_exception
 import mock
 from oslo_config import cfg
 from oslo_serialization import jsonutils
+from oslo_utils import uuidutils
 
 from nova.api.metadata import base as instance_metadata
 from nova.compute import power_state as nova_states
@@ -27,7 +28,6 @@ from nova import context as nova_context
 from nova import exception
 from nova import objects
 from nova.openstack.common import loopingcall
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit import utils

nova/tests/unit/virt/libvirt/test_driver.py

@@ -41,6 +41,7 @@ from oslo_utils import encodeutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 import six
 
 from nova.api.metadata import base as instance_metadata
@@ -59,7 +60,6 @@ from nova.network import model as network_model
 from nova import objects
 from nova.openstack.common import fileutils
 from nova.openstack.common import loopingcall
-from nova.openstack.common import uuidutils
 from nova.pci import manager as pci_manager
 from nova import test
 from nova.tests.unit import fake_block_device

nova/tests/unit/virt/libvirt/test_imagebackend.py

@@ -25,12 +25,12 @@ from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_utils import units
+from oslo_utils import uuidutils
 
 from nova import context
 from nova import exception
 from nova import keymgr
 from nova.openstack.common import imageutils
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit import fake_processutils
 from nova.tests.unit.virt.libvirt import fake_libvirt_utils

nova/tests/unit/virt/vmwareapi/fake.py

@@ -24,10 +24,10 @@ import collections
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
 
 from nova import exception
-from nova.openstack.common import uuidutils
 from nova.virt.vmwareapi import constants
 from nova.virt.vmwareapi import ds_util
 

nova/tests/unit/virt/vmwareapi/test_driver_api.py

@@ -30,6 +30,7 @@ from mox3 import mox
 from oslo_config import cfg
 from oslo_utils import timeutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
 from oslo_vmware import pbm
 from oslo_vmware import vim
@@ -47,7 +48,6 @@ from nova import exception
 from nova.image import glance
 from nova.network import model as network_model
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit import fake_instance
 import nova.tests.unit.image.fake

nova/tests/unit/virt/vmwareapi/test_vm_util.py

@@ -19,13 +19,13 @@ import contextlib
 import re
 
 import mock
+from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
 from oslo_vmware import pbm
 
 from nova import context
 from nova import exception
 from nova.network import model as network_model
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit import fake_instance
 from nova.tests.unit.virt.vmwareapi import fake

nova/tests/unit/virt/vmwareapi/test_vmops.py

@@ -16,6 +16,7 @@ import contextlib
 
 import mock
 from oslo_utils import units
+from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
 
 from nova.compute import power_state
@@ -24,7 +25,6 @@ from nova import db
 from nova import exception
 from nova.network import model as network_model
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests.unit import fake_instance
 import nova.tests.unit.image.fake

nova/virt/hyperv/vmops.py

@@ -28,13 +28,13 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 
 from nova.api.metadata import base as instance_metadata
 from nova import exception
 from nova.i18n import _, _LI, _LE, _LW
 from nova.openstack.common import fileutils
 from nova.openstack.common import loopingcall
-from nova.openstack.common import uuidutils
 from nova import utils
 from nova.virt import configdrive
 from nova.virt import hardware

nova/virt/vmwareapi/vmops.py

@@ -30,6 +30,7 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import strutils
 from oslo_utils import units
+from oslo_utils import uuidutils
 from oslo_vmware import exceptions as vexc
 
 from nova.api.metadata import base as instance_metadata
@@ -42,7 +43,6 @@ from nova import context as nova_context
 from nova import exception
 from nova.i18n import _, _LE, _LI, _LW
 from nova import objects
-from nova.openstack.common import uuidutils
 from nova import utils
 from nova.virt import configdrive
 from nova.virt import diagnostics

openstack-common.conf

@@ -21,7 +21,6 @@ module=service
 module=sslutils
 module=systemd
 module=threadgroup
-module=uuidutils
 module=versionutils
 
 # The base module to hold the copy of openstack.common

tools/xenserver/populate_other_config.py

@@ -38,11 +38,11 @@ if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
         sys.path.insert(0, possible_topdir)
 
 from nova import config
-from nova.openstack.common import uuidutils
 from nova.virt import virtapi
 from nova.virt.xenapi import driver as xenapi_driver
 from nova.virt.xenapi import vm_utils
 from oslo_config import cfg
+from oslo_utils import uuidutils
 
 cli_opts = [
     cfg.BoolOpt('dry-run',