Alon Bar-Lev has uploaded a new change for review.
Change subject: api: do not expose internal constants
......................................................................
api: do not expose internal constants
Change-Id: I4bab09d938936edc5cc07f69648d3b0a1c7209b9
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M src/ovirt_host_deploy/constants.py
M src/plugins/ovirt-host-deploy/core/misc.py
M src/plugins/ovirt-host-deploy/node/persist.py
M src/plugins/ovirt-host-deploy/vdsm/bridge.py
M src/plugins/ovirt-host-deploy/vdsm/config.py
M src/plugins/ovirt-host-deploy/vdsm/packages.py
M src/plugins/ovirt-host-deploy/vdsm/pki.py
M src/plugins/ovirt-host-deploy/vdsm/vdsmid.py
M src/plugins/ovirt-host-deploy/vdsmhooks/hooks.py
9 files changed, 52 insertions(+), 42 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-host-deploy
refs/changes/12/10112/1
diff --git a/src/ovirt_host_deploy/constants.py
b/src/ovirt_host_deploy/constants.py
index 6b14255..1b493a5 100644
--- a/src/ovirt_host_deploy/constants.py
+++ b/src/ovirt_host_deploy/constants.py
@@ -25,8 +25,7 @@
@util.export
-@util.codegen
-class Const(object):
+class FileLocations(object):
OVIRT_HOST_DEPLOY_CONFIG_FILE = '/etc/ovirt-host-deploy.conf'
OVIRT_HOST_DEPLOY_LOG_PREFIX = 'ovirt-host-deploy'
@@ -51,15 +50,23 @@
VDSM_DATA_DIR = '/usr/share/vdsm'
- KEY_SIZE = 2048
+ HOOKS_DIR = '/usr/libexec/vdsm/hooks'
+ HOOKS_PLUGIN_HOOKS_DIR = 'hooks.d'
+ HOOKS_PLUGIN_PACKAGES_DIR = 'packages.d'
+
+
+@util.export
+class Defaults(object):
+ DEFAULT_KEY_SIZE = 2048
+
+
+@util.export
+@util.codegen
+class Const(object):
CERTIFICATE_ENROLLMENT_NONE = 'none'
CERTIFICATE_ENROLLMENT_INLINE = 'inline'
CERTIFICATE_ENROLLMENT_REQUEST = 'request'
CERTIFICATE_ENROLLMENT_ACCEPT = 'accept'
-
- HOOKS_DIR = '/usr/libexec/vdsm/hooks'
- HOOKS_PLUGIN_HOOKS_DIR = 'hooks.d'
- HOOKS_PLUGIN_PACKAGES_DIR = 'packages.d'
@util.export
diff --git a/src/plugins/ovirt-host-deploy/core/misc.py
b/src/plugins/ovirt-host-deploy/core/misc.py
index f0d9313..15ae9b8 100644
--- a/src/plugins/ovirt-host-deploy/core/misc.py
+++ b/src/plugins/ovirt-host-deploy/core/misc.py
@@ -49,11 +49,11 @@
def _preinit(self):
self.environment.setdefault(
otopicons.CoreEnv.LOG_FILE_NAME_PREFIX,
- odeploycons.Const.OVIRT_HOST_DEPLOY_LOG_PREFIX
+ odeploycons.FileLocations.OVIRT_HOST_DEPLOY_LOG_PREFIX
)
self.environment.setdefault(
otopicons.CoreEnv.CONFIG_FILE_NAME,
- odeploycons.Const.OVIRT_HOST_DEPLOY_CONFIG_FILE
+ odeploycons.FileLocations.OVIRT_HOST_DEPLOY_CONFIG_FILE
)
self.environment[
odeploycons.CoreEnv.INTERFACE_VERSION
diff --git a/src/plugins/ovirt-host-deploy/node/persist.py
b/src/plugins/ovirt-host-deploy/node/persist.py
index d109af4..eef7d57 100644
--- a/src/plugins/ovirt-host-deploy/node/persist.py
+++ b/src/plugins/ovirt-host-deploy/node/persist.py
@@ -51,7 +51,7 @@
from ovirtnode import ovirtfunctions
for f in (
- [odeploycons.Const.VDSM_ID_FILE] +
+ [odeploycons.FileLocations.VDSM_ID_FILE] +
self.environment[otopicons.CoreEnv.MODIFIED_FILES]
):
self.logger.debug('persisting: %s' % f)
diff --git a/src/plugins/ovirt-host-deploy/vdsm/bridge.py
b/src/plugins/ovirt-host-deploy/vdsm/bridge.py
index b23ac79..fa2834b 100644
--- a/src/plugins/ovirt-host-deploy/vdsm/bridge.py
+++ b/src/plugins/ovirt-host-deploy/vdsm/bridge.py
@@ -483,7 +483,7 @@
self.execute(
(
os.path.join(
- odeploycons.Const.VDSM_DATA_DIR,
+ odeploycons.FileLocations.VDSM_DATA_DIR,
'delNetwork',
),
name,
@@ -532,7 +532,7 @@
(
[
os.path.join(
- odeploycons.Const.VDSM_DATA_DIR,
+ odeploycons.FileLocations.VDSM_DATA_DIR,
'addNetwork',
),
name,
@@ -795,7 +795,7 @@
self.execute(
(
os.path.join(
- odeploycons.Const.VDSM_DATA_DIR,
+ odeploycons.FileLocations.VDSM_DATA_DIR,
'vdsm-store-net-config',
),
),
diff --git a/src/plugins/ovirt-host-deploy/vdsm/config.py
b/src/plugins/ovirt-host-deploy/vdsm/config.py
index 26406c4..b2b8f3f 100644
--- a/src/plugins/ovirt-host-deploy/vdsm/config.py
+++ b/src/plugins/ovirt-host-deploy/vdsm/config.py
@@ -97,7 +97,7 @@
if b.content:
self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
filetransaction.FileTransaction(
- name=odeploycons.Const.VDSM_CONFIG_FILE,
+ name=odeploycons.FileLocations.VDSM_CONFIG_FILE,
owner='root',
enforcePermissions=True,
content=b.content,
diff --git a/src/plugins/ovirt-host-deploy/vdsm/packages.py
b/src/plugins/ovirt-host-deploy/vdsm/packages.py
index a8923a4..fdbc008 100644
--- a/src/plugins/ovirt-host-deploy/vdsm/packages.py
+++ b/src/plugins/ovirt-host-deploy/vdsm/packages.py
@@ -102,7 +102,7 @@
)
def _closeup(self):
- with open(odeploycons.Const.VDSM_FORCE_RECONFIGURE, 'w'):
+ with open(odeploycons.FileLocations.VDSM_FORCE_RECONFIGURE, 'w'):
pass
# libvirt-guests is a conflict
diff --git a/src/plugins/ovirt-host-deploy/vdsm/pki.py
b/src/plugins/ovirt-host-deploy/vdsm/pki.py
index 528e406..178e215 100644
--- a/src/plugins/ovirt-host-deploy/vdsm/pki.py
+++ b/src/plugins/ovirt-host-deploy/vdsm/pki.py
@@ -180,7 +180,7 @@
)
self.environment.setdefault(
odeploycons.VdsmEnv.KEY_SIZE,
- odeploycons.Const.KEY_SIZE
+ odeploycons.Defaults.DEFAULT_KEY_SIZE
)
@plugin.event(
@@ -202,7 +202,7 @@
self.environment[
odeploycons.VdsmEnv.CERTIFICATE_ENROLLMENT
] == odeploycons.Const.CERTIFICATE_ENROLLMENT_ACCEPT and
- not os.path.exists(odeploycons.Const.VDSM_KEY_PENDING_FILE)
+ not os.path.exists(odeploycons.FileLocations.VDSM_KEY_PENDING_FILE)
):
raise RuntimeError(_('PKI accept mode while no pending request'))
self._enabled = True
@@ -222,10 +222,10 @@
def _misc(self):
self.dialog.note(_('Setting up PKI'))
- vdsmTrustStore = odeploycons.Const.VDSM_TRUST_STORE
- if os.path.exists(odeploycons.Const.VDSM_CONFIG_FILE):
+ vdsmTrustStore = odeploycons.FileLocations.VDSM_TRUST_STORE
+ if os.path.exists(odeploycons.FileLocations.VDSM_CONFIG_FILE):
config = configparser.ConfigParser()
- config.read([odeploycons.Const.VDSM_CONFIG_FILE])
+ config.read([odeploycons.FileLocations.VDSM_CONFIG_FILE])
try:
vdsmTrustStore = config.get('vars', 'trust_store_path')
except:
@@ -237,7 +237,10 @@
]
if enrollment == odeploycons.Const.CERTIFICATE_ENROLLMENT_ACCEPT:
- with open(odeploycons.Const.VDSM_KEY_PENDING_FILE, 'r') as f:
+ with open(
+ odeploycons.FileLocations.VDSM_KEY_PENDING_FILE,
+ 'r'
+ ) as f:
vdsmkey = f.read()
else:
if useM2Crypto:
@@ -264,7 +267,7 @@
filetransaction.FileTransaction(
name=os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_KEY_PENDING_FILE,
+ odeploycons.FileLocations.VDSM_KEY_PENDING_FILE,
),
owner='root',
downer='vdsm',
@@ -300,15 +303,15 @@
for f in (
os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_CA_FILE,
+ odeploycons.FileLocations.VDSM_CA_FILE,
),
os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_SPICE_CA_FILE,
+ odeploycons.FileLocations.VDSM_SPICE_CA_FILE,
),
os.path.join(
- odeploycons.Const.LIBVIRT_DEFAULT_TRUST_STORE,
- odeploycons.Const.LIBVIRT_DEFAULT_CLIENT_CA_FILE,
+ odeploycons.FileLocations.LIBVIRT_DEFAULT_TRUST_STORE,
+ odeploycons.FileLocations.LIBVIRT_DEFAULT_CLIENT_CA_FILE,
),
):
self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
@@ -326,15 +329,15 @@
for f in (
os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_CERT_FILE,
+ odeploycons.FileLocations.VDSM_CERT_FILE,
),
os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_SPICE_CERT_FILE,
+ odeploycons.FileLocations.VDSM_SPICE_CERT_FILE,
),
os.path.join(
- odeploycons.Const.LIBVIRT_DEFAULT_TRUST_STORE,
- odeploycons.Const.LIBVIRT_DEFAULT_CLIENT_CERT_FILE,
+ odeploycons.FileLocations.LIBVIRT_DEFAULT_TRUST_STORE,
+ odeploycons.FileLocations.LIBVIRT_DEFAULT_CLIENT_CERT_FILE,
),
):
self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
@@ -352,15 +355,15 @@
for f in (
os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_KEY_FILE,
+ odeploycons.FileLocations.VDSM_KEY_FILE,
),
os.path.join(
vdsmTrustStore,
- odeploycons.Const.VDSM_SPICE_KEY_FILE,
+ odeploycons.FileLocations.VDSM_SPICE_KEY_FILE,
),
os.path.join(
- odeploycons.Const.LIBVIRT_DEFAULT_TRUST_STORE,
- odeploycons.Const.LIBVIRT_DEFAULT_CLIENT_KEY_FILE,
+ odeploycons.FileLocations.LIBVIRT_DEFAULT_TRUST_STORE,
+ odeploycons.FileLocations.LIBVIRT_DEFAULT_CLIENT_KEY_FILE,
),
):
self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
@@ -388,5 +391,5 @@
if self.environment[
odeploycons.VdsmEnv.CERTIFICATE_ENROLLMENT
] != odeploycons.Const.CERTIFICATE_ENROLLMENT_REQUEST:
- if os.path.exists(odeploycons.Const.VDSM_KEY_PENDING_FILE):
- os.unlink(odeploycons.Const.VDSM_KEY_PENDING_FILE)
+ if os.path.exists(odeploycons.FileLocations.VDSM_KEY_PENDING_FILE):
+ os.unlink(odeploycons.FileLocations.VDSM_KEY_PENDING_FILE)
diff --git a/src/plugins/ovirt-host-deploy/vdsm/vdsmid.py
b/src/plugins/ovirt-host-deploy/vdsm/vdsmid.py
index 289b31b..857089a 100644
--- a/src/plugins/ovirt-host-deploy/vdsm/vdsmid.py
+++ b/src/plugins/ovirt-host-deploy/vdsm/vdsmid.py
@@ -65,8 +65,8 @@
)
def _setup(self):
self.command.detect('dmidecode')
- if os.path.exists(odeploycons.Const.VDSM_ID_FILE):
- with open(odeploycons.Const.VDSM_ID_FILE, 'r') as f:
+ if os.path.exists(odeploycons.FileLocations.VDSM_ID_FILE):
+ with open(odeploycons.FileLocations.VDSM_ID_FILE, 'r') as f:
self._vdsmId = f.readline().rstrip('\n')
self.environment[odeploycons.VdsmEnv.VDSM_ID] = self._vdsmId
@@ -127,7 +127,7 @@
def _store_id(self):
self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append(
filetransaction.FileTransaction(
- name=odeploycons.Const.VDSM_ID_FILE,
+ name=odeploycons.FileLocations.VDSM_ID_FILE,
owner='root',
enforcePermissions=True,
content=self.environment[
diff --git a/src/plugins/ovirt-host-deploy/vdsmhooks/hooks.py
b/src/plugins/ovirt-host-deploy/vdsmhooks/hooks.py
index 54c9448..b04e849 100644
--- a/src/plugins/ovirt-host-deploy/vdsmhooks/hooks.py
+++ b/src/plugins/ovirt-host-deploy/vdsmhooks/hooks.py
@@ -48,7 +48,7 @@
def _hooks(self):
pluginhooksdir = os.path.join(
os.path.dirname(__file__),
- odeploycons.Const.HOOKS_PLUGIN_HOOKS_DIR,
+ odeploycons.FileLocations.HOOKS_PLUGIN_HOOKS_DIR,
)
if os.path.exists(pluginhooksdir):
for (pathname, __, files) in os.walk(pluginhooksdir):
@@ -74,7 +74,7 @@
].append(
filetransaction.FileTransaction(
name=os.path.join(
- odeploycons.Const.HOOKS_DIR,
+ odeploycons.FileLocations.HOOKS_DIR,
rel,
name,
),
@@ -93,7 +93,7 @@
def _packages(self):
pluginpackagesdir = os.path.join(
os.path.dirname(__file__),
- odeploycons.Const.HOOKS_PLUGIN_PACKAGES_DIR,
+ odeploycons.FileLocations.HOOKS_PLUGIN_PACKAGES_DIR,
)
if os.path.exists(pluginpackagesdir):
for name in sorted(os.listdir(pluginpackagesdir)):
--
To view, visit http://gerrit.ovirt.org/10112
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bab09d938936edc5cc07f69648d3b0a1c7209b9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-host-deploy
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
