There have been some changes in pyroute code structuring so we have to adapt these changes in our code.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Common/NetUtils.py | 4 ++-- lnst/Slave/InterfaceManager.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lnst/Common/NetUtils.py b/lnst/Common/NetUtils.py index 79d2de7..0aa14ee 100644 --- a/lnst/Common/NetUtils.py +++ b/lnst/Common/NetUtils.py @@ -20,8 +20,8 @@ from pyroute2.netlink import NLM_F_REQUEST from pyroute2.netlink import NLM_F_DUMP from pyroute2.netlink import NLMSG_DONE from pyroute2.netlink import NLMSG_ERROR -from pyroute2.netlink.iproute import RTM_GETLINK -from pyroute2.netlink.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_GETLINK +from pyroute2.iproute import RTM_NEWLINK from pyroute2.netlink.rtnl.ifinfmsg import ifinfmsg
def normalize_hwaddr(hwaddr): diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 81347a6..a25cc40 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -19,8 +19,8 @@ from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.NetUtils import scan_netdevs from lnst.Common.ExecCmd import exec_cmd from pyroute2 import IPRSocket -from pyroute2.netlink.iproute import RTM_NEWLINK -from pyroute2.netlink.iproute import RTM_DELLINK +from pyroute2.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_DELLINK
class IfMgrError(Exception): pass
Wed, Oct 15, 2014 at 08:50:25AM CEST, jtluka@redhat.com wrote:
There have been some changes in pyroute code structuring so we have to adapt these changes in our code.
Wouln't it be desirable to be able to run with new pyroute2 and also the old one?
Signed-off-by: Jan Tluka jtluka@redhat.com
lnst/Common/NetUtils.py | 4 ++-- lnst/Slave/InterfaceManager.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lnst/Common/NetUtils.py b/lnst/Common/NetUtils.py index 79d2de7..0aa14ee 100644 --- a/lnst/Common/NetUtils.py +++ b/lnst/Common/NetUtils.py @@ -20,8 +20,8 @@ from pyroute2.netlink import NLM_F_REQUEST from pyroute2.netlink import NLM_F_DUMP from pyroute2.netlink import NLMSG_DONE from pyroute2.netlink import NLMSG_ERROR -from pyroute2.netlink.iproute import RTM_GETLINK -from pyroute2.netlink.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_GETLINK +from pyroute2.iproute import RTM_NEWLINK from pyroute2.netlink.rtnl.ifinfmsg import ifinfmsg
def normalize_hwaddr(hwaddr): diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 81347a6..a25cc40 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -19,8 +19,8 @@ from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.NetUtils import scan_netdevs from lnst.Common.ExecCmd import exec_cmd from pyroute2 import IPRSocket -from pyroute2.netlink.iproute import RTM_NEWLINK -from pyroute2.netlink.iproute import RTM_DELLINK +from pyroute2.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_DELLINK
class IfMgrError(Exception): pass -- 1.9.3
LNST-developers mailing list LNST-developers@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
Wed, Oct 15, 2014 at 09:48:26AM CEST, jpirko@redhat.com wrote:
Wed, Oct 15, 2014 at 08:50:25AM CEST, jtluka@redhat.com wrote:
There have been some changes in pyroute code structuring so we have to adapt these changes in our code.
Wouln't it be desirable to be able to run with new pyroute2 and also the old one?
For RHEL release I don't see a reason for this. A workflow would be like this:
1. easy_install pyroute2 (that would install the 0.3.x version) 2. git clone lnst_repo || yum install lnst-{slave,ctl} 3. run lnst
I think there are really no dependencies from pyroute2 side, currently it's running fine with python 2.6 and 2.7.
For Fedora this could be desirable if a user wants to user python-pyroute2 rpm but it seems that it has not been updated for a long time - in F20 repo there's 0.1.11 version. And I guess if we request an update the pyroute2 would be updated to 0.3.x anyway.
Signed-off-by: Jan Tluka jtluka@redhat.com
lnst/Common/NetUtils.py | 4 ++-- lnst/Slave/InterfaceManager.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lnst/Common/NetUtils.py b/lnst/Common/NetUtils.py index 79d2de7..0aa14ee 100644 --- a/lnst/Common/NetUtils.py +++ b/lnst/Common/NetUtils.py @@ -20,8 +20,8 @@ from pyroute2.netlink import NLM_F_REQUEST from pyroute2.netlink import NLM_F_DUMP from pyroute2.netlink import NLMSG_DONE from pyroute2.netlink import NLMSG_ERROR -from pyroute2.netlink.iproute import RTM_GETLINK -from pyroute2.netlink.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_GETLINK +from pyroute2.iproute import RTM_NEWLINK from pyroute2.netlink.rtnl.ifinfmsg import ifinfmsg
def normalize_hwaddr(hwaddr): diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 81347a6..a25cc40 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -19,8 +19,8 @@ from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.NetUtils import scan_netdevs from lnst.Common.ExecCmd import exec_cmd from pyroute2 import IPRSocket -from pyroute2.netlink.iproute import RTM_NEWLINK -from pyroute2.netlink.iproute import RTM_DELLINK +from pyroute2.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_DELLINK
class IfMgrError(Exception): pass -- 1.9.3
LNST-developers mailing list LNST-developers@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
Wed, Oct 15, 2014 at 10:39:04AM CEST, jtluka@redhat.com wrote:
Wed, Oct 15, 2014 at 09:48:26AM CEST, jpirko@redhat.com wrote:
Wed, Oct 15, 2014 at 08:50:25AM CEST, jtluka@redhat.com wrote:
There have been some changes in pyroute code structuring so we have to adapt these changes in our code.
Wouln't it be desirable to be able to run with new pyroute2 and also the old one?
For RHEL release I don't see a reason for this. A workflow would be like this:
- easy_install pyroute2 (that would install the 0.3.x version)
- git clone lnst_repo || yum install lnst-{slave,ctl}
- run lnst
I think there are really no dependencies from pyroute2 side, currently it's running fine with python 2.6 and 2.7.
For Fedora this could be desirable if a user wants to user python-pyroute2 rpm but it seems that it has not been updated for a long time - in F20 repo there's 0.1.11 version. And I guess if we request an update the pyroute2 would be updated to 0.3.x anyway.
Yes, please assume that user would like to do that. Please fix the patch and send again. Thanks.
Signed-off-by: Jan Tluka jtluka@redhat.com
lnst/Common/NetUtils.py | 4 ++-- lnst/Slave/InterfaceManager.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lnst/Common/NetUtils.py b/lnst/Common/NetUtils.py index 79d2de7..0aa14ee 100644 --- a/lnst/Common/NetUtils.py +++ b/lnst/Common/NetUtils.py @@ -20,8 +20,8 @@ from pyroute2.netlink import NLM_F_REQUEST from pyroute2.netlink import NLM_F_DUMP from pyroute2.netlink import NLMSG_DONE from pyroute2.netlink import NLMSG_ERROR -from pyroute2.netlink.iproute import RTM_GETLINK -from pyroute2.netlink.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_GETLINK +from pyroute2.iproute import RTM_NEWLINK from pyroute2.netlink.rtnl.ifinfmsg import ifinfmsg
def normalize_hwaddr(hwaddr): diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 81347a6..a25cc40 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -19,8 +19,8 @@ from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.NetUtils import scan_netdevs from lnst.Common.ExecCmd import exec_cmd from pyroute2 import IPRSocket -from pyroute2.netlink.iproute import RTM_NEWLINK -from pyroute2.netlink.iproute import RTM_DELLINK +from pyroute2.iproute import RTM_NEWLINK +from pyroute2.iproute import RTM_DELLINK
class IfMgrError(Exception): pass -- 1.9.3
LNST-developers mailing list LNST-developers@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
lnst-developers@lists.fedorahosted.org