On 10/20/2015 01:05 PM, Petr Vobornik wrote:
On 10/20/2015 09:19 AM, Martin Babinsky wrote:
On 10/13/2015 07:04 PM, Martin Babinsky wrote:
On 10/13/2015 06:55 PM, Martin Babinsky wrote:
mbabinsk - hide segment direction from topology commands
Ooops forgot to regenerate API.txt. Attaching updated patch.
Ping for review.
commit message is wrong, it doesn't do anything with Web UI. Also there
is only one patch, not 1/2, otherwise ACK.
Yes the commit message was confusing. I have rewritten it completely.
Attaching updated patch.
--
Martin^3 Babinsky
From e35b708c67ae83dad8f0f6d794339eff271ebefc Mon Sep 17 00:00:00 2001
From: Martin Babinsky <mbabi...@redhat.com>
Date: Mon, 12 Oct 2015 17:49:50 +0200
Subject: [PATCH] do not ask for segment direction when running topology
commands
https://fedorahosted.org/freeipa/ticket/5222
---
API.txt | 2 +-
VERSION | 4 ++--
ipalib/plugins/topology.py | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/API.txt b/API.txt
index cf5446114a9ccffad8d87421b4cd75c92ff267ee..873c6d54221a0c1657b5457bd9dceedb4adf06b3 100644
--- a/API.txt
+++ b/API.txt
@@ -4804,7 +4804,7 @@ arg: Str('topologysuffixcn', cli_name='topologysuffix', multivalue=False, primar
arg: Str('cn', attribute=True, cli_name='name', maxlength=255, multivalue=False, primary_key=True, required=True)
option: Str('addattr*', cli_name='addattr', exclude='webui')
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui')
-option: StrEnum('iparepltoposegmentdirection', attribute=True, cli_name='direction', default=u'both', multivalue=False, required=True, values=(u'both', u'left-right', u'right-left'))
+option: StrEnum('iparepltoposegmentdirection', attribute=True, autofill=True, cli_name='direction', default=u'both', multivalue=False, required=True, values=(u'both', u'left-right', u'right-left'))
option: Str('iparepltoposegmentleftnode', attribute=True, cli_name='leftnode', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9.][a-zA-Z0-9.-]{0,252}[a-zA-Z0-9.$-]?$', required=True)
option: Str('iparepltoposegmentrightnode', attribute=True, cli_name='rightnode', maxlength=255, multivalue=False, pattern='^[a-zA-Z0-9.][a-zA-Z0-9.-]{0,252}[a-zA-Z0-9.$-]?$', required=True)
option: StrEnum('nsds5replicaenabled', attribute=True, cli_name='enabled', multivalue=False, required=False, values=(u'on', u'off'))
diff --git a/VERSION b/VERSION
index a14b89f289f7d859f381cf78a742a5a5d038d491..cdda198c6ce3148dcf785149dc3ce050782e8caa 100644
--- a/VERSION
+++ b/VERSION
@@ -90,5 +90,5 @@ IPA_DATA_VERSION=20100614120000
# #
########################################################
IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=156
-# Last change: pvoborni - add vault container commands
+IPA_API_VERSION_MINOR=157
+# Last change: mbabinsk - hide segment direction from topology commands
diff --git a/ipalib/plugins/topology.py b/ipalib/plugins/topology.py
index c6b86b5909cf5ef2c02515f7a6cbe4e987a927a9..2b82215e273d959fdb207801ed146b843460bae5 100644
--- a/ipalib/plugins/topology.py
+++ b/ipalib/plugins/topology.py
@@ -105,6 +105,7 @@ class topologysegment(LDAPObject):
label=_('Connectivity'),
values=(u'both', u'left-right', u'right-left'),
default=u'both',
+ autofill=True,
doc=_('Direction of replication between left and right replication '
'node'),
flags={'no_option', 'no_update'},
--
2.4.3
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
