summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-03-20 15:51:07 -0400
committerGitHub <noreply@github.com>2020-03-20 15:51:07 -0400
commit0173e852a760d2b9a697b5f07330a226839e350b (patch)
tree3cd3dedcbbeba7a66577377ee00c4062dd19a085 /cloudinit
parent877cafd8363a49b85d6f659d4ddaa296c8cee504 (diff)
downloadvyos-cloud-init-0173e852a760d2b9a697b5f07330a226839e350b.tar.gz
vyos-cloud-init-0173e852a760d2b9a697b5f07330a226839e350b.zip
test_oracle,DataSourceOracle: sort imports (#266)
* test_oracle: sort imports * DataSourceOracle: sort imports
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/sources/DataSourceOracle.py18
-rw-r--r--cloudinit/sources/tests/test_oracle.py17
2 files changed, 19 insertions, 16 deletions
diff --git a/cloudinit/sources/DataSourceOracle.py b/cloudinit/sources/DataSourceOracle.py
index 83fcfc16..90e1881a 100644
--- a/cloudinit/sources/DataSourceOracle.py
+++ b/cloudinit/sources/DataSourceOracle.py
@@ -15,17 +15,19 @@ Notes:
* Both bare-metal and vms provide chassis-asset-tag of OracleCloud.com
"""
-from cloudinit.url_helper import combine_url, readurl, UrlError
-from cloudinit.net import dhcp, get_interfaces_by_mac, is_netfail_master
-from cloudinit import net
-from cloudinit import sources
-from cloudinit import util
-from cloudinit.net import cmdline
-from cloudinit import log as logging
-
import json
import re
+from cloudinit import log as logging
+from cloudinit import net, sources, util
+from cloudinit.net import (
+ cmdline,
+ dhcp,
+ get_interfaces_by_mac,
+ is_netfail_master,
+)
+from cloudinit.url_helper import UrlError, combine_url, readurl
+
LOG = logging.getLogger(__name__)
BUILTIN_DS_CONFIG = {
diff --git a/cloudinit/sources/tests/test_oracle.py b/cloudinit/sources/tests/test_oracle.py
index 316efc4f..4e135df9 100644
--- a/cloudinit/sources/tests/test_oracle.py
+++ b/cloudinit/sources/tests/test_oracle.py
@@ -1,20 +1,21 @@
# This file is part of cloud-init. See LICENSE file for license information.
-from cloudinit.sources import DataSourceOracle as oracle
-from cloudinit.sources import BrokenMetadata, NetworkConfigSource
-from cloudinit import helpers
-
-from cloudinit.tests import helpers as test_helpers
-
-from textwrap import dedent
import argparse
import copy
-import httpretty
import json
import os
import uuid
+from textwrap import dedent
from unittest import mock
+import httpretty
+
+from cloudinit import helpers
+from cloudinit.sources import BrokenMetadata
+from cloudinit.sources import DataSourceOracle as oracle
+from cloudinit.sources import NetworkConfigSource
+from cloudinit.tests import helpers as test_helpers
+
DS_PATH = "cloudinit.sources.DataSourceOracle"
MD_VER = "2013-10-17"