Commit fb0fa957 authored by Petr Pudlak's avatar Petr Pudlak

Add the WConfD daemon to build configuration files

Also list it in the Haskell datatype, constants, Python constants and
test configuration.
Signed-off-by: default avatarPetr Pudlak <pudlak@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 13f59e11
...@@ -1870,6 +1870,8 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \ ...@@ -1870,6 +1870,8 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \
-DRAPI_GROUP="$(RAPI_GROUP)" \ -DRAPI_GROUP="$(RAPI_GROUP)" \
-DCONFD_USER="$(CONFD_USER)" \ -DCONFD_USER="$(CONFD_USER)" \
-DCONFD_GROUP="$(CONFD_GROUP)" \ -DCONFD_GROUP="$(CONFD_GROUP)" \
-DWCONFD_USER="$(WCONFD_USER)" \
-DWCONFD_GROUP="$(WCONFD_GROUP)" \
-DKVMD_USER="$(KVMD_USER)" \ -DKVMD_USER="$(KVMD_USER)" \
-DKVMD_GROUP="$(KVMD_GROUP)" \ -DKVMD_GROUP="$(KVMD_GROUP)" \
-DLUXID_USER="$(LUXID_USER)" \ -DLUXID_USER="$(LUXID_USER)" \
...@@ -1957,6 +1959,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories ...@@ -1957,6 +1959,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \ echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
echo 's#@''GNTWCONFDUSER@#$(WCONFD_USER)#g'; \
echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \ echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \
echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \ echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
...@@ -1964,6 +1967,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories ...@@ -1964,6 +1967,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \ echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \
echo 's#@''GNTWCONFDGROUP@#$(CONFD_GROUP)#g'; \
echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \ echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \
echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
......
...@@ -228,6 +228,7 @@ AC_ARG_WITH([user-prefix], ...@@ -228,6 +228,7 @@ AC_ARG_WITH([user-prefix],
user_metad="${withval}metad"; user_metad="${withval}metad";
user_rapi="${withval}rapi"; user_rapi="${withval}rapi";
user_confd="${withval}confd"; user_confd="${withval}confd";
user_wconfd="${withval}wconfd";
user_kvmd="$user_default"; user_kvmd="$user_default";
user_luxid="${withval}luxid"; user_luxid="${withval}luxid";
user_noded="$user_default"; user_noded="$user_default";
...@@ -236,6 +237,7 @@ AC_ARG_WITH([user-prefix], ...@@ -236,6 +237,7 @@ AC_ARG_WITH([user-prefix],
user_metad="$user_default"; user_metad="$user_default";
user_rapi="$user_default"; user_rapi="$user_default";
user_confd="$user_default"; user_confd="$user_default";
user_wconfd="$user_default";
user_kvmd="$user_default"; user_kvmd="$user_default";
user_luxid="$user_default"; user_luxid="$user_default";
user_noded="$user_default"; user_noded="$user_default";
...@@ -244,6 +246,7 @@ AC_SUBST(MASTERD_USER, $user_masterd) ...@@ -244,6 +246,7 @@ AC_SUBST(MASTERD_USER, $user_masterd)
AC_SUBST(METAD_USER, $user_metad) AC_SUBST(METAD_USER, $user_metad)
AC_SUBST(RAPI_USER, $user_rapi) AC_SUBST(RAPI_USER, $user_rapi)
AC_SUBST(CONFD_USER, $user_confd) AC_SUBST(CONFD_USER, $user_confd)
AC_SUBST(WCONFD_USER, $user_wconfd)
AC_SUBST(KVMD_USER, $user_kvmd) AC_SUBST(KVMD_USER, $user_kvmd)
AC_SUBST(LUXID_USER, $user_luxid) AC_SUBST(LUXID_USER, $user_luxid)
AC_SUBST(NODED_USER, $user_noded) AC_SUBST(NODED_USER, $user_noded)
...@@ -259,6 +262,7 @@ AC_ARG_WITH([group-prefix], ...@@ -259,6 +262,7 @@ AC_ARG_WITH([group-prefix],
[group_rapi="${withval}rapi"; [group_rapi="${withval}rapi";
group_admin="${withval}admin"; group_admin="${withval}admin";
group_confd="${withval}confd"; group_confd="${withval}confd";
group_wconfd="${withval}wconfd";
group_kvmd="$group_default"; group_kvmd="$group_default";
group_luxid="${withval}luxid"; group_luxid="${withval}luxid";
group_masterd="${withval}masterd"; group_masterd="${withval}masterd";
...@@ -269,6 +273,7 @@ AC_ARG_WITH([group-prefix], ...@@ -269,6 +273,7 @@ AC_ARG_WITH([group-prefix],
[group_rapi="$group_default"; [group_rapi="$group_default";
group_admin="$group_default"; group_admin="$group_default";
group_confd="$group_default"; group_confd="$group_default";
group_wconfd="$group_default";
group_kvmd="$group_default"; group_kvmd="$group_default";
group_luxid="$group_default"; group_luxid="$group_default";
group_masterd="$group_default"; group_masterd="$group_default";
...@@ -279,6 +284,7 @@ AC_ARG_WITH([group-prefix], ...@@ -279,6 +284,7 @@ AC_ARG_WITH([group-prefix],
AC_SUBST(RAPI_GROUP, $group_rapi) AC_SUBST(RAPI_GROUP, $group_rapi)
AC_SUBST(ADMIN_GROUP, $group_admin) AC_SUBST(ADMIN_GROUP, $group_admin)
AC_SUBST(CONFD_GROUP, $group_confd) AC_SUBST(CONFD_GROUP, $group_confd)
AC_SUBST(WCONFD_GROUP, $group_wconfd)
AC_SUBST(KVMD_GROUP, $group_kvmd) AC_SUBST(KVMD_GROUP, $group_kvmd)
AC_SUBST(LUXID_GROUP, $group_luxid) AC_SUBST(LUXID_GROUP, $group_luxid)
AC_SUBST(MASTERD_GROUP, $group_masterd) AC_SUBST(MASTERD_GROUP, $group_masterd)
...@@ -292,6 +298,7 @@ AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) ...@@ -292,6 +298,7 @@ AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd])
AC_MSG_NOTICE([Running ganeti-metad as $group_metad:$group_metad]) AC_MSG_NOTICE([Running ganeti-metad as $group_metad:$group_metad])
AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi]) AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi])
AC_MSG_NOTICE([Running ganeti-confd as $user_confd:$group_confd]) AC_MSG_NOTICE([Running ganeti-confd as $user_confd:$group_confd])
AC_MSG_NOTICE([Running ganeti-wconfd as $user_wconfd:$group_wconfd])
AC_MSG_NOTICE([Running ganeti-luxid as $user_luxid:$group_luxid]) AC_MSG_NOTICE([Running ganeti-luxid as $user_luxid:$group_luxid])
AC_MSG_NOTICE([Group for daemons is $group_daemons]) AC_MSG_NOTICE([Group for daemons is $group_daemons])
AC_MSG_NOTICE([Group for clients is $group_admin]) AC_MSG_NOTICE([Group for clients is $group_admin])
......
@GNTMASTERUSER@ @GNTDAEMONSGROUP@ @GNTMASTERUSER@ @GNTDAEMONSGROUP@
@GNTCONFDUSER@ @GNTDAEMONSGROUP@ @GNTCONFDUSER@ @GNTDAEMONSGROUP@
@GNTWCONFDUSER@ @GNTDAEMONSGROUP@
@GNTLUXIDUSER@ @GNTDAEMONSGROUP@ @GNTLUXIDUSER@ @GNTDAEMONSGROUP@
@GNTRAPIUSER@ @GNTDAEMONSGROUP@ @GNTRAPIUSER@ @GNTDAEMONSGROUP@
@GNTMONDUSER@ @GNTDAEMONSGROUP@ @GNTMONDUSER@ @GNTDAEMONSGROUP@
......
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
@GNTMASTERUSER@ @GNTMASTERUSER@
@GNTRAPIUSER@ @GNTRAPIUSER@
@GNTCONFDUSER@ @GNTCONFDUSER@
@GNTWCONFDUSER@
@GNTLUXIDUSER@ @GNTLUXIDUSER@
@GNTMONDUSER@ @GNTMONDUSER@
@GNTMASTERUSER@ @GNTMASTERDGROUP@ @GNTMASTERUSER@ @GNTMASTERDGROUP@
@GNTRAPIUSER@ @GNTRAPIGROUP@ @GNTRAPIUSER@ @GNTRAPIGROUP@
@GNTCONFDUSER@ @GNTCONFDGROUP@ @GNTCONFDUSER@ @GNTCONFDGROUP@
@GNTWCONFDUSER@ @GNTWCONFDGROUP@
@GNTLUXIDUSER@ @GNTLUXIDGROUP@ @GNTLUXIDUSER@ @GNTLUXIDGROUP@
@GNTMONDUSER@ @GNTMONDGROUP@ @GNTMONDUSER@ @GNTMONDGROUP@
@GNTNODEDUSER@ @GNTNODEDUSER@
...@@ -79,6 +79,8 @@ class GetentResolver: ...@@ -79,6 +79,8 @@ class GetentResolver:
@ivar masterd_gid: The resolved gid of the masterd group @ivar masterd_gid: The resolved gid of the masterd group
@ivar confd_uid: The resolved uid of the confd user @ivar confd_uid: The resolved uid of the confd user
@ivar confd_gid: The resolved gid of the confd group @ivar confd_gid: The resolved gid of the confd group
@ivar wconfd_uid: The resolved uid of the wconfd user
@ivar wconfd_gid: The resolved gid of the wconfd group
@ivar luxid_uid: The resolved uid of the luxid user @ivar luxid_uid: The resolved uid of the luxid user
@ivar luxid_gid: The resolved gid of the luxid group @ivar luxid_gid: The resolved gid of the luxid group
@ivar rapi_uid: The resolved uid of the rapi user @ivar rapi_uid: The resolved uid of the rapi user
...@@ -99,6 +101,9 @@ class GetentResolver: ...@@ -99,6 +101,9 @@ class GetentResolver:
self.confd_uid = GetUid(constants.CONFD_USER, _getpwnam) self.confd_uid = GetUid(constants.CONFD_USER, _getpwnam)
self.confd_gid = GetGid(constants.CONFD_GROUP, _getgrnam) self.confd_gid = GetGid(constants.CONFD_GROUP, _getgrnam)
self.wconfd_uid = GetUid(constants.WCONFD_USER, _getpwnam)
self.wconfd_gid = GetGid(constants.WCONFD_GROUP, _getgrnam)
self.luxid_uid = GetUid(constants.LUXID_USER, _getpwnam) self.luxid_uid = GetUid(constants.LUXID_USER, _getpwnam)
self.luxid_gid = GetGid(constants.LUXID_GROUP, _getgrnam) self.luxid_gid = GetGid(constants.LUXID_GROUP, _getgrnam)
...@@ -118,6 +123,7 @@ class GetentResolver: ...@@ -118,6 +123,7 @@ class GetentResolver:
self._uid2user = { self._uid2user = {
self.masterd_uid: constants.MASTERD_USER, self.masterd_uid: constants.MASTERD_USER,
self.confd_uid: constants.CONFD_USER, self.confd_uid: constants.CONFD_USER,
self.wconfd_uid: constants.WCONFD_USER,
self.luxid_uid: constants.LUXID_USER, self.luxid_uid: constants.LUXID_USER,
self.rapi_uid: constants.RAPI_USER, self.rapi_uid: constants.RAPI_USER,
self.noded_uid: constants.NODED_USER, self.noded_uid: constants.NODED_USER,
...@@ -127,6 +133,7 @@ class GetentResolver: ...@@ -127,6 +133,7 @@ class GetentResolver:
self._gid2group = { self._gid2group = {
self.masterd_gid: constants.MASTERD_GROUP, self.masterd_gid: constants.MASTERD_GROUP,
self.confd_gid: constants.CONFD_GROUP, self.confd_gid: constants.CONFD_GROUP,
self.wconfd_gid: constants.WCONFD_GROUP,
self.luxid_gid: constants.LUXID_GROUP, self.luxid_gid: constants.LUXID_GROUP,
self.rapi_gid: constants.RAPI_GROUP, self.rapi_gid: constants.RAPI_GROUP,
self.noded_gid: constants.NODED_GROUP, self.noded_gid: constants.NODED_GROUP,
......
...@@ -175,6 +175,12 @@ confdUser = "CONFD_USER" ...@@ -175,6 +175,12 @@ confdUser = "CONFD_USER"
confdGroup :: String confdGroup :: String
confdGroup = "CONFD_GROUP" confdGroup = "CONFD_GROUP"
wconfdUser :: String
wconfdUser = "WCONFD_USER"
wconfdGroup :: String
wconfdGroup = "WCONFD_GROUP"
kvmdUser :: String kvmdUser :: String
kvmdUser = "KVMD_USER" kvmdUser = "KVMD_USER"
......
...@@ -218,6 +218,12 @@ confdUser = Runtime.daemonUser GanetiConfd ...@@ -218,6 +218,12 @@ confdUser = Runtime.daemonUser GanetiConfd
confdGroup :: String confdGroup :: String
confdGroup = Runtime.daemonGroup (DaemonGroup GanetiConfd) confdGroup = Runtime.daemonGroup (DaemonGroup GanetiConfd)
wconfdUser :: String
wconfdUser = Runtime.daemonUser GanetiWConfd
wconfdGroup :: String
wconfdGroup = Runtime.daemonGroup (DaemonGroup GanetiWConfd)
kvmdUser :: String kvmdUser :: String
kvmdUser = Runtime.daemonUser GanetiKvmd kvmdUser = Runtime.daemonUser GanetiKvmd
......
...@@ -64,6 +64,7 @@ data GanetiDaemon = GanetiMasterd ...@@ -64,6 +64,7 @@ data GanetiDaemon = GanetiMasterd
| GanetiNoded | GanetiNoded
| GanetiRapi | GanetiRapi
| GanetiConfd | GanetiConfd
| GanetiWConfd
| GanetiKvmd | GanetiKvmd
| GanetiLuxid | GanetiLuxid
| GanetiMond | GanetiMond
...@@ -86,6 +87,7 @@ daemonName GanetiMetad = "ganeti-metad" ...@@ -86,6 +87,7 @@ daemonName GanetiMetad = "ganeti-metad"
daemonName GanetiNoded = "ganeti-noded" daemonName GanetiNoded = "ganeti-noded"
daemonName GanetiRapi = "ganeti-rapi" daemonName GanetiRapi = "ganeti-rapi"
daemonName GanetiConfd = "ganeti-confd" daemonName GanetiConfd = "ganeti-confd"
daemonName GanetiWConfd = "ganeti-wconfd"
daemonName GanetiKvmd = "ganeti-kvmd" daemonName GanetiKvmd = "ganeti-kvmd"
daemonName GanetiLuxid = "ganeti-luxid" daemonName GanetiLuxid = "ganeti-luxid"
daemonName GanetiMond = "ganeti-mond" daemonName GanetiMond = "ganeti-mond"
...@@ -97,6 +99,7 @@ daemonOnlyOnMaster GanetiMetad = False ...@@ -97,6 +99,7 @@ daemonOnlyOnMaster GanetiMetad = False
daemonOnlyOnMaster GanetiNoded = False daemonOnlyOnMaster GanetiNoded = False
daemonOnlyOnMaster GanetiRapi = False daemonOnlyOnMaster GanetiRapi = False
daemonOnlyOnMaster GanetiConfd = False daemonOnlyOnMaster GanetiConfd = False
daemonOnlyOnMaster GanetiWConfd = True
daemonOnlyOnMaster GanetiKvmd = False daemonOnlyOnMaster GanetiKvmd = False
daemonOnlyOnMaster GanetiLuxid = True daemonOnlyOnMaster GanetiLuxid = True
daemonOnlyOnMaster GanetiMond = False daemonOnlyOnMaster GanetiMond = False
...@@ -108,6 +111,7 @@ daemonLogBase GanetiMetad = "meta-daemon" ...@@ -108,6 +111,7 @@ daemonLogBase GanetiMetad = "meta-daemon"
daemonLogBase GanetiNoded = "node-daemon" daemonLogBase GanetiNoded = "node-daemon"
daemonLogBase GanetiRapi = "rapi-daemon" daemonLogBase GanetiRapi = "rapi-daemon"
daemonLogBase GanetiConfd = "conf-daemon" daemonLogBase GanetiConfd = "conf-daemon"
daemonLogBase GanetiWConfd = "wconf-daemon"
daemonLogBase GanetiKvmd = "kvm-daemon" daemonLogBase GanetiKvmd = "kvm-daemon"
daemonLogBase GanetiLuxid = "luxi-daemon" daemonLogBase GanetiLuxid = "luxi-daemon"
daemonLogBase GanetiMond = "monitoring-daemon" daemonLogBase GanetiMond = "monitoring-daemon"
...@@ -119,6 +123,7 @@ daemonUser GanetiMetad = AutoConf.metadUser ...@@ -119,6 +123,7 @@ daemonUser GanetiMetad = AutoConf.metadUser
daemonUser GanetiNoded = AutoConf.nodedUser daemonUser GanetiNoded = AutoConf.nodedUser
daemonUser GanetiRapi = AutoConf.rapiUser daemonUser GanetiRapi = AutoConf.rapiUser
daemonUser GanetiConfd = AutoConf.confdUser daemonUser GanetiConfd = AutoConf.confdUser
daemonUser GanetiWConfd = AutoConf.wconfdUser
daemonUser GanetiKvmd = AutoConf.kvmdUser daemonUser GanetiKvmd = AutoConf.kvmdUser
daemonUser GanetiLuxid = AutoConf.luxidUser daemonUser GanetiLuxid = AutoConf.luxidUser
daemonUser GanetiMond = AutoConf.mondUser daemonUser GanetiMond = AutoConf.mondUser
...@@ -130,6 +135,7 @@ daemonGroup (DaemonGroup GanetiMetad) = AutoConf.metadGroup ...@@ -130,6 +135,7 @@ daemonGroup (DaemonGroup GanetiMetad) = AutoConf.metadGroup
daemonGroup (DaemonGroup GanetiNoded) = AutoConf.nodedGroup daemonGroup (DaemonGroup GanetiNoded) = AutoConf.nodedGroup
daemonGroup (DaemonGroup GanetiRapi) = AutoConf.rapiGroup daemonGroup (DaemonGroup GanetiRapi) = AutoConf.rapiGroup
daemonGroup (DaemonGroup GanetiConfd) = AutoConf.confdGroup daemonGroup (DaemonGroup GanetiConfd) = AutoConf.confdGroup
daemonGroup (DaemonGroup GanetiWConfd) = AutoConf.wconfdGroup
daemonGroup (DaemonGroup GanetiLuxid) = AutoConf.luxidGroup daemonGroup (DaemonGroup GanetiLuxid) = AutoConf.luxidGroup
daemonGroup (DaemonGroup GanetiKvmd) = AutoConf.kvmdGroup daemonGroup (DaemonGroup GanetiKvmd) = AutoConf.kvmdGroup
daemonGroup (DaemonGroup GanetiMond) = AutoConf.mondGroup daemonGroup (DaemonGroup GanetiMond) = AutoConf.mondGroup
......
...@@ -83,6 +83,7 @@ case_UsersGroups = do ...@@ -83,6 +83,7 @@ case_UsersGroups = do
\ constants.NODED_USER,\n\ \ constants.NODED_USER,\n\
\ constants.RAPI_USER,\n\ \ constants.RAPI_USER,\n\
\ constants.CONFD_USER,\n\ \ constants.CONFD_USER,\n\
\ constants.WCONFD_USER,\n\
\ constants.KVMD_USER,\n\ \ constants.KVMD_USER,\n\
\ constants.LUXID_USER,\n\ \ constants.LUXID_USER,\n\
\ constants.METAD_USER,\n\ \ constants.METAD_USER,\n\
...@@ -92,6 +93,7 @@ case_UsersGroups = do ...@@ -92,6 +93,7 @@ case_UsersGroups = do
\ constants.NODED_GROUP,\n\ \ constants.NODED_GROUP,\n\
\ constants.RAPI_GROUP,\n\ \ constants.RAPI_GROUP,\n\
\ constants.CONFD_GROUP,\n\ \ constants.CONFD_GROUP,\n\
\ constants.WCONFD_GROUP,\n\
\ constants.KVMD_GROUP,\n\ \ constants.KVMD_GROUP,\n\
\ constants.LUXID_GROUP,\n\ \ constants.LUXID_GROUP,\n\
\ constants.METAD_GROUP,\n\ \ constants.METAD_GROUP,\n\
......
...@@ -42,6 +42,7 @@ def _StubGetpwnam(user): ...@@ -42,6 +42,7 @@ def _StubGetpwnam(user):
constants.RAPI_USER: _EntStub(uid=2), constants.RAPI_USER: _EntStub(uid=2),
constants.NODED_USER: _EntStub(uid=3), constants.NODED_USER: _EntStub(uid=3),
constants.LUXID_USER: _EntStub(uid=4), constants.LUXID_USER: _EntStub(uid=4),
constants.WCONFD_USER: _EntStub(uid=5),
} }
return users[user] return users[user]
...@@ -55,6 +56,7 @@ def _StubGetgrnam(group): ...@@ -55,6 +56,7 @@ def _StubGetgrnam(group):
constants.ADMIN_GROUP: _EntStub(gid=4), constants.ADMIN_GROUP: _EntStub(gid=4),
constants.NODED_GROUP: _EntStub(gid=5), constants.NODED_GROUP: _EntStub(gid=5),
constants.LUXID_GROUP: _EntStub(gid=6), constants.LUXID_GROUP: _EntStub(gid=6),
constants.WCONFD_GROUP: _EntStub(gid=7),
} }
return groups[group] return groups[group]
...@@ -86,6 +88,10 @@ class TestErrors(unittest.TestCase): ...@@ -86,6 +88,10 @@ class TestErrors(unittest.TestCase):
_StubGetpwnam(constants.CONFD_USER).pw_uid) _StubGetpwnam(constants.CONFD_USER).pw_uid)
self.assertEqual(self.resolver.confd_gid, self.assertEqual(self.resolver.confd_gid,
_StubGetgrnam(constants.CONFD_GROUP).gr_gid) _StubGetgrnam(constants.CONFD_GROUP).gr_gid)
self.assertEqual(self.resolver.wconfd_uid,
_StubGetpwnam(constants.WCONFD_USER).pw_uid)
self.assertEqual(self.resolver.wconfd_gid,
_StubGetgrnam(constants.WCONFD_GROUP).gr_gid)
self.assertEqual(self.resolver.rapi_uid, self.assertEqual(self.resolver.rapi_uid,
_StubGetpwnam(constants.RAPI_USER).pw_uid) _StubGetpwnam(constants.RAPI_USER).pw_uid)
self.assertEqual(self.resolver.rapi_gid, self.assertEqual(self.resolver.rapi_gid,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment