import time
import logging
-log = logging.getLogger('pyi2ncommon.mk_config')
# custom imports
from . import arnied_wrapper as aw
from .cnfline import build_cnfvar, build_group, build_intraclient
from .cnfline import build_nic, build_provider, build_user
+log = logging.getLogger('pyi2ncommon.mk_config')
###############################################################################
# MINOR CONFIGURATION
###############################################################################
+
def simple(varname, data, filename):
"""
Generate and save a single-variable configuration file.
:rtype: str
"""
log.info("Create arnied user configuration")
- user = batch_update_cnf(
+ user_obj = batch_update_cnf(
build_user.BuildUser(data=username, instance=instance, line_no=1),
[(Update, ("USER_FULLNAME", 0, username)),
(Update, ("USER_GROUP_MEMBER_REF", 0, "1")),
user_cnf = "user-%d-%s.cnf" % (time.time(), suffix)
[user_cnf] = aw.prep_config_paths([user_cnf], aw.DUMP_CONFIG_DIR)
logging.info("Saving user configuration to %s", user_cnf)
- user.save(user_cnf)
+ user_obj.save(user_cnf)
return user_cnf
(Update, ("GROUP_EMAIL_RELAY_RIGHTS", 0, "RELAY_FROM_INTRANET")),
(Update, ("GROUP_ACTIVESYNC_ENABLE", 0, "1" if activesync_enable else "0")),
(Update, ("GROUP_XAUTH_ENABLE", 0, "1" if xauth_enable else "0")),
- (Delete, ("GROUP_COMMENT"))])
+ (Delete, ("GROUP_COMMENT",))])
group_cnf = "group-%d-%s.cnf" % (time.time(), suffix)
[group_cnf] = aw.prep_config_paths([group_cnf], aw.DUMP_CONFIG_DIR)
logging.info("Saving group configuration to %s", group_cnf)
def group_all(proxy_profile="1", suffix="host"):
"""
- Generate and save an All group configuration file.
+ Generate and save an "All" group configuration file.
:param str proxy_profile: proxy profile instance reference
:param str suffix: optional suffix to use for config identification
(Update, ("GROUP_EMAILFILTER_BAN_FILTERLIST_REF", 0, "-1")),
(Update, ("GROUP_EMAIL_RELAY_RIGHTS", 0, "RELAY_FROM_EVERYWHERE")),
(Update, ("GROUP_PROXY_PROFILE_REF", 0, proxy_profile)),
- (Delete, ("GROUP_COMMENT"))])
+ (Delete, ("GROUP_COMMENT",))])
group_cnf = "group-%d-%s.cnf" % (time.time(), suffix)
[group_cnf] = aw.prep_config_paths([group_cnf], aw.DUMP_CONFIG_DIR)
:rtype: str
"""
log.info("Create arnied nic configuration")
- nic = batch_update_cnf(
+ nic_obj = batch_update_cnf(
build_nic.BuildNIC(data="", instance=instance, line_no=1),
[(Update, ("NIC_TYPE", 0, nictype)),
(Update, ("NIC_LAN_IP", 0, ip)),
nic_cnf = "nic-%d-%s.cnf" % (time.time(), suffix)
[nic_cnf] = aw.prep_config_paths([nic_cnf], aw.DUMP_CONFIG_DIR)
logging.info("Saving nic configuration to %s", nic_cnf)
- nic.save(nic_cnf)
+ nic_obj.save(nic_cnf)
return nic_cnf
:rtype: str
"""
log.info("Create arnied intraclient configuration")
- intraclient = batch_update_cnf(build_intraclient.BuildIntraclient(data=name,
- instance=instance),
- [(Update, ("INTRACLIENT_IP", 0, ip)),
- (Update, ("INTRACLIENT_MAC", 0, mac)),
- (Update, ("INTRACLIENT_FIREWALL_RULESET_REF", 0, fwrules))])
+ intraclient_obj = batch_update_cnf(
+ build_intraclient.BuildIntraclient(data=name, instance=instance),
+ [(Update, ("INTRACLIENT_IP", 0, ip)),
+ (Update, ("INTRACLIENT_MAC", 0, mac)),
+ (Update, ("INTRACLIENT_FIREWALL_RULESET_REF", 0, fwrules))])
intraclient_cnf = "intraclient-%d-%s.cnf" % (time.time(), suffix)
[intraclient_cnf] = aw.prep_config_paths([intraclient_cnf], aw.DUMP_CONFIG_DIR)
logging.info("Saving intraclient configuration to %s", intraclient_cnf)
- intraclient.save(intraclient_cnf)
+ intraclient_obj.save(intraclient_cnf)
return intraclient_cnf
:rtype: str
"""
log.info("Create arnied provider configuration")
+
def add_or_del(var, field):
if var is not None:
- return (Add, (field, 0, str(var)))
- return (Delete, field)
- provider = batch_update_cnf(build_provider.BuildProvider(data=name, instance=instance),
- [(Update, ("PROVIDER_MODE", 0, mode)),
- ip and (Update, ("PROVIDER_IP", 0, ip))
- or (Delete, "PROVIDER_IP"),
- localip
- and (Update, ("PROVIDER_LOCALIP", 0, localip))
- or (Delete, "PROVIDER_LOCALIP"),
- netmask and (Update, ("PROVIDER_NETMASK", 0,
- netmask))
- or (Delete, "PROVIDER_NETMASK"),
- (Update, ("PROVIDER_TIMEOUT", 0, timeout)),
- (Update, ("PROVIDER_DNS_MODE", 0, dnsmode)),
- (Update, ("PROVIDER_DNS", 0,
- dns if dnsmode == "IP" else "")),
- (Update, ("PROVIDER_MTU_MODE", 0, mtumode)),
- (Update, ("PROVIDER_MTU_SIZE", 0,
- mtusize if mtumode != "AUTO" else "")),
- (Update, ("PROVIDER_FIREWALL_RULESET_REF", 0, str(fwrules))),
- add_or_del(vlanid, "PROVIDER_VLAN_ID"),
- add_or_del(dialretry, "PROVIDER_DIAL_RETRY"),
- add_or_del(login, "PROVIDER_LOGIN"),
- add_or_del(password, "PROVIDER_PASSWORD"),
- add_or_del(modemip, "PROVIDER_MODEM_IP"),
- add_or_del(providerid, "PROVIDER_PROVIDERID"),
- add_or_del(localdhcp, "PROVIDER_LOCAL_DHCP")])
+ return Add, (field, 0, str(var))
+ return Delete, field
+ provider_obj = batch_update_cnf(
+ build_provider.BuildProvider(data=name, instance=instance),
+ [(Update, ("PROVIDER_MODE", 0, mode)),
+ ip and (Update, ("PROVIDER_IP", 0, ip))
+ or (Delete, "PROVIDER_IP"),
+ localip
+ and (Update, ("PROVIDER_LOCALIP", 0, localip))
+ or (Delete, "PROVIDER_LOCALIP"),
+ netmask and (Update, ("PROVIDER_NETMASK", 0,
+ netmask))
+ or (Delete, "PROVIDER_NETMASK"),
+ (Update, ("PROVIDER_TIMEOUT", 0, timeout)),
+ (Update, ("PROVIDER_DNS_MODE", 0, dnsmode)),
+ (Update, ("PROVIDER_DNS", 0,
+ dns if dnsmode == "IP" else "")),
+ (Update, ("PROVIDER_MTU_MODE", 0, mtumode)),
+ (Update, ("PROVIDER_MTU_SIZE", 0,
+ mtusize if mtumode != "AUTO" else "")),
+ (Update, ("PROVIDER_FIREWALL_RULESET_REF", 0, str(fwrules))),
+ add_or_del(vlanid, "PROVIDER_VLAN_ID"),
+ add_or_del(dialretry, "PROVIDER_DIAL_RETRY"),
+ add_or_del(login, "PROVIDER_LOGIN"),
+ add_or_del(password, "PROVIDER_PASSWORD"),
+ add_or_del(modemip, "PROVIDER_MODEM_IP"),
+ add_or_del(providerid, "PROVIDER_PROVIDERID"),
+ add_or_del(localdhcp, "PROVIDER_LOCAL_DHCP")])
provider_cnf = "provider-%d-%s.cnf" % (time.time(), suffix)
[provider_cnf] = aw.prep_config_paths([provider_cnf], aw.DUMP_CONFIG_DIR)
logging.info("Saving provider configuration to %s", provider_cnf)
- provider.save(provider_cnf)
+ provider_obj.save(provider_cnf)
return provider_cnf
:rtype: str
"""
log.info("Create arnied provider configuration.")
- provider = batch_update_cnf(build_provider.BuildProvider(),
- [(Update, ("PROVIDER_MODE", 0, mode)),
- (Update, ("PROVIDER_DNS", 0, ip)),
- (Update, ("PROVIDER_DYNDNS_ENABLE", 0, "0")),
- (Update, ("PROVIDER_IP", 0, ip)),
- (Update, ("PROVIDER_PROXY_SERVER", 0, ip)),
- (Update, ("PROVIDER_PROXY_PORT", 0, str(proxy_port))),
- localip
- and (Update, ("PROVIDER_LOCALIP", 0, localip))
- or (Delete, "PROVIDER_LOCALIP"),
- (Update, ("PROVIDER_DNS_MODE", 0, "IP")),
- (Update, ("PROVIDER_FIREWALL_RULESET_REF", 0, str(fwrules)))])
+ provider_obj = batch_update_cnf(
+ build_provider.BuildProvider(),
+ [(Update, ("PROVIDER_MODE", 0, mode)),
+ (Update, ("PROVIDER_DNS", 0, ip)),
+ (Update, ("PROVIDER_DYNDNS_ENABLE", 0, "0")),
+ (Update, ("PROVIDER_IP", 0, ip)),
+ (Update, ("PROVIDER_PROXY_SERVER", 0, ip)),
+ (Update, ("PROVIDER_PROXY_PORT", 0, str(proxy_port))),
+ localip
+ and (Update, ("PROVIDER_LOCALIP", 0, localip))
+ or (Delete, "PROVIDER_LOCALIP"),
+ (Update, ("PROVIDER_DNS_MODE", 0, "IP")),
+ (Update, ("PROVIDER_FIREWALL_RULESET_REF", 0, str(fwrules)))])
provider_cnf = "provider-%d-%s.cnf" % (time.time(), suffix)
[provider_cnf] = aw.prep_config_paths([provider_cnf], aw.DUMP_CONFIG_DIR)
logging.info("Saving provider configuration to %s", provider_cnf)
- provider.save(provider_cnf)
+ provider_obj.save(provider_cnf)
return provider_cnf
git://developer.intra2net.com / pyi2ncommon / blobdiff