June 2019 - LNST-developers - Fedora mailing-lists

[PATCH-next 0/1] Refactor of setup script
by jurbanov＠redhat.com 01 Jul '19

01 Jul '19

From: Jozef Urbanovsky <jurbanov(a)redhat.com> Hi, This is basically v2 patch of "[PATCH-next] setup.py: refactoring code for next". It contains iterative change to the first patch, where install_requires part is omitted and instead all external python dependencies are moved to its own "requirements.txt" file. This change allows us easier manipulation with additional dependencies in downstream code, as previous implementation would create issues with future merge requests. Jozef Urbanovsky (1): setup.py: refactoring code to use requirements requirements.txt | 4 ++++ setup.py | 9 ++------- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 requirements.txt -- 2.21.0

2 2

新《劳动合同法》《工伤保险条例》河南洛阳协和医院投资管理有限公司目前已在国内外及河2019/6/23 星期日上午 3:53:17
by 高力娟 22 Jun '19

22 Jun '19

新《劳动合同法》《工伤保险条例》实操应对技巧与有效调岗调薪、裁员解雇、违纪员工处理及新个税、新社保下用工模式调整策略 3200元/二天时间：2019年06月24--25日上海（A单元） 06月27--28日北京（A单元） 06月17--18日深圳（A单元）【主讲】钟永棣【课程费用】 3200元/二天（含二天中餐、指定PDF版本教材、茶点）【报名咨询】程先生 17715543974【同微信】【报名邮箱】384631378(a)qq.com ( 报名请发送至该邮箱，我们将在一个工作日内回复,未及时回复请电话联系【背景】 2008年至今，随着《劳动合同法》《劳动争议调解仲裁法》《劳动合同法实施条例》《职工带薪年休假条例》《企业职工带薪年休假实施办法》《社会保险法》《职业病防治法》《工伤保险条例》《女职工劳动保护特别规定》《企业民主管理规定》《劳动争议司法解释（三）》《劳动争议司法解释（四）》《工伤保险司法解释》《劳务派遣暂行规定》《劳动人事争议仲裁办案规则》等法律法规的相继出台或修订，全国各地的劳动争议案件出现“井喷”“爆发”等现象！近几年，沿海发达地区及一二线城市的劳动争议案件依旧“稳中有涨”“持续递增”，而内地欠发达地区及三五线城市的劳动争议案件亦日趋增多！ 2008年至今，大部分的劳动争议案件均以用人单位败诉告终！这些案件充分说明，“传统式、粗放式、随便式”的人力资源管理模式已经被完全否定，已经彻底落后，已经无法适应新的形势！用人单位的人力资源法律风险无处不在，广大用人单位很有必要尽快学习相关政策法律法规，掌握防范用工风险和化解劳动争议的技能技巧，掌握证明劳动者“不合格、不胜任、严重失职、严重违纪”的实操策略，以迅速构建行之有效的劳动争议风险防范机制，以迅速杜绝或减少劳动争议的发生及败诉的概率，以重新树立与持续维护用人单位的管理权威！ 2018年下半年，国家修改了《个人所得税法》及决定将社保费改由税务部门征收。五证合一、金税三期、新个税法、社保改税，将对企业产生哪些影响，带来哪些法律风险？企业何去何从，如何应对，如何调整？综上，我们特邀请我国著名的劳动法、劳动关系与劳动争议实战专家钟永棣老师主讲此培训课程。欢迎企事业单位积极组织相关人员参加此课程！【课程目的】 1、全面了解人力资源管理过程中的法律风险； 2、透彻理解与人力资源管理有关的政策法律法规； 3、深度培养预测、分析人力资源管理法律风险的思维； 4、系统掌握预防和应对法律风险的实战技能及方法工具…… 【课程大纲】 A单元内容（共2天，20个以上经典案例）专题一：招聘入职 1.如何预防劳动者的“应聘欺诈”，如何证明劳动者的“欺诈”？ 2.入职前后用人单位应告知劳动者哪些情况，如何保留证据？ 3.《入职登记表》如何设计，才能起到预防法律风险的作用？ 4.劳动者无法提交《离职证明》，该怎么办？ 5.企业如何书写《录用通知书》，其法律风险有哪些？ 6.是否需要核心岗位应聘者签署《背景调查授权书》？ 7.用人单位自行拟定的劳动合同文本是否有效，是否需要进行备案？ 8.劳动合同的装订存在哪些风险细节？ 9.劳动者借故拖延或拒绝签订劳动合同，用人单位如何应对？ 10.未签订劳动合同，需支付多长期限的双倍工资？是否受到仲裁时效的限制？ 11.劳动合同期满，继续留用劳动者，但未续签合同，是否也需支付双倍工资？ 12.在关联企业之间转移劳动关系，需如何变更或重签劳动合同？ 13.应否与属于职业经理人的法人代表签订劳动合同？专题二：试用期 1.可否先试用后签合同，可否单独签订试用期协议？ 2.员工主动申请延长试用期，该怎样操作，才规避赔偿风险？ 3.试用期满后辞退员工，最少赔2个月工资，该如何化解？ 4.试用期最后一天辞退员工，赔偿概率为70%，如何化解？ 5.试用期满前几天辞退员工，赔偿概率为50%，如何化解？ 6.不符合录用条件的范围包括哪些，如何取证证明？ 7.《试用期辞退通知书》如何书写，以避免违法解除的赔偿金？ 8.出现“经济性裁员”情况，优先裁掉试用期的新员工，合法吗？ 9.试用期员工经常请假休假，导致难以对其观察考核，如何处理？ 10.出现“经济性裁员”情况，能否裁掉处于试用期的新员工？专题三：无固定期限劳动合同 1.无固定期限劳动合同到底是不是铁饭碗，会不会增加企业成本？ 2.无固定期限劳动合同解除的条件、理由有哪些？ 3.用人单位拒绝签订无固定期限劳动合同，有何风险？ 4.签订了固定期限劳动合同的员工，期间工作累计满10年，能否要求将固定期限合同变更为无固定期限合同？ 5.连续订立二次固定期限劳动合同到期，用人单位能否终止合同；员工提出签订无固定期限合同，用人单位能否拒绝？ 6.满10年或第二次固定期限合同到期时，用人单位是否应提醒员工签订无固定期限合同？ 7.合同期满劳动者由于医疗期、三期等原因续延劳动合同导致劳动者连续工作满十年，劳动者提出订立无固定期限劳动合同的，用人单位能否拒绝？ 8.是否有必要刻意规避无固定期限合同的签订？专题四：培训、保密与竞业限制 1.培训服务期与劳动合同期限有何不同，两者发生冲突时如何适用？ 2.培训服务期未到期，而劳动合同到期，用人单位终止劳动合同的，是否属于提前解除劳动合同，如何规避？ 3.劳动者严重过错被解雇，用人单位能否依据服务期约定要求劳动者支付违约金？ 4.在什么情况下，可签署竞业限制协议？ 5.在什么时候，企业更有主动权签署竞业限制协议？ 6.无约定经济补偿的支付，竞业限制是否有效？ 7.竞业限制的经济补偿的标准如何界定？ 8.要求员工保密，企业需要支付保密工资吗？ 9.主张员工侵犯商业秘密，用人单位需证明哪些细节？ 10.培训协议、保密协议、竞业限制协议的核心条款！专题五：劳动关系解除与终止 1.双方协商解除劳动合同并约定支付适当的经济补偿，事后劳动者追讨经济补偿的差额部分，能否胜诉，企业如何避免案件败诉？ 2.能否与“三期妇女、特殊保护期间的员工”协商解除，如何规避风险？ 3.员工未提前30日通知企业即自行离职，企业能否扣减其工资？ 4.员工提交辞职信后的30天内，企业批准其离职，可能有风险，如何化解？ 5.员工提交辞职信后的30天后，企业批准其离职，也可能有风险，如何化解？ 6.对于患病员工，能否解除，如何操作才能降低法律风险？ 7.实行末位淘汰制，以末位排名为由解雇员工，往往被认定非法解雇，企业该如何做，才避免案件败诉？ 8.以“组织架构调整，无合适岗位安排”为由解雇员工，感觉非常符合常理，但往往被认定非法解雇，企业该如何做才避免风险？ 9.以“经济性裁员”名义解雇员工，感觉非常符合常理，但往往被认定非法解雇，企业该如何操作？ 10.《解除劳动合同通知书》如果表述不当，往往成为劳动者打赢官司的有力证据，企业该如何书写，才避免案件败诉而承担法律责任？ 11.解除劳动合同前未通知及征求工会的意见，是否构成非法解除？ 12.劳动合同到期后，经常出现该终止的忘记办理终止手续，该续签的忘记办理续签手续，其引发的风险非常大；那么企业该如何规避风险？ 13.用人单位不出具《离职证明》的，有什么法律责任？专题六：社会保险法 1.用人单位拖欠社保费，有什么法律责任？ 2.用人单位不足额缴纳社会保险如何处理？ 3.员工不愿意买社保，并与单位签有协议的情况下，该协议是否有效？ 4.员工放弃参加社保，日后能否提出被迫解除及索赔经济补偿？ 5.如果无参保，劳动者因第三方责任产生的医疗费用，能否要求单位报销？ 6.企业协助辞职员工骗取失业保险金，有什么法律风险？ 7.女职工未婚先孕、未婚生育争议如何处理？ 8.怀孕女职工提出长期休假保胎，直至修完产假，该如何协调此问题？专题七：新个税新社保下的用工调整 1.新个税法对企业、劳动者的影响？ 2.社保入税对企业、劳动者的影响？ 3.过往的社保问题，是否会被追责？ 4.工资总额包括哪些项目？ 5.参保基数包括哪些项目？ 6.年终奖发还是不发？ 7.薪酬方面可以进行哪些调整？ 8.新政下企业用工模式可以进行哪些调整？专题八：劳动争议处理 1.用人单位败诉的原因主要有哪些？ 2.公开审理的开庭形式，有何风险，如何避免风险？ 3.申请仲裁的时效如何计算；如何理解“劳动争议发生之日”？ 4.如何书写答辩书，有哪些注意事项？ 5.开庭期间，质证与辩论需要注意哪些关键问题？ 6.举证责任如何分配，无法举证的后果有哪些？ 7.领取裁决书、判决书的几点技巧； 8.和解书与调解书的区别及运用策略。 B单元内容（共2天，20个以上经典案例）专题一：违纪违规问题员工处理 1.劳动者往往拒绝签收处分、解雇通知书，如何应对？ 2.问题员工往往拒绝提交《检讨书》或否认违纪违规事实，企业该如何收集证据？ 3.对于违纪员工，应该在什么时间内处理？ 4.怎样理解“严重违反用人单位的规章制度”? 5.如何在《惩罚条例》中描述“一般违纪”、“较重违纪”及“严重违纪”？ 6.怎样理解与操作“严重失职，营私舞弊，给用人单位造成重大损害”？ 7.如何追究“严重失职、严重违纪违规”者的法律责任？ 8.能否直接规定“禁止兼职，否则视为严重违纪违规”？ 9.直线部门经理擅自口头辞退员工，仲裁机构往往认定企业非法解雇，企业该如何做，才避免案件败诉？ 10.劳动者不辞而别、无故旷工，却主张被企业口头解雇，往往得到仲裁机构的支持，企业该如何做，才避免案件败诉？ 11.劳动者被行政拘留、刑事拘留、司法拘留期间，劳动关系如何处理？ 12.“录音录象”证据，仲裁与法院是否采信；企业内部OA系统上的资料能否作为证据使用；电子邮件、手机短信能否作为证据使用？专题二：绩效管理与岗位调整 1.企业单方调整岗位，员工往往可被迫解除合同并索赔经济补偿，如何规避？ 2.调岗时没有书面确认，员工到新岗位工作2个月后能否要求恢复到原岗位？ 3.可否对“三期内”女职工进行调岗、调薪？ 4.在同一城市内搬迁或变动工作地点，员工可以拒绝吗？ 5.员工认同绩效结果，为什么在“不胜任工作”引发的争议中还是败诉？ 6.为什么企业根据绩效结果支付员工绩效奖金，最终被认定非法克扣工资？ 7.法律上如何证明劳动者“不能胜任工作”？ 8.对绩效考核不合格的员工，如何合法辞退？ 9.绩效正态分布往往强制划分5%的员工为不合格者，是否合法？ 10.不称职等同于不胜任工作吗？专题三：工资福利与薪酬调整 1.新进员工薪资管理问题及处理技巧； 2．调整工作岗位后，如何单方调薪、降薪？ 3．如何通过薪酬调整处理员工失职、违纪等问题？ 4．什么情况下可以扣减员工的工资？ 5．值班算不算加班，如何防范风险？ 6．未经单位确认，劳动者自行加班，能否主张加班费？ 7．年薪制的员工能否主张加班费？ 8．如何设计工资构成以降低加班费成本？ 9．员工主张入职以来的加班费，如何应对？ 10．员工在工作日下班后加班，能否安排补休而不支付加班费？ 11.内部规定“已离职员工无权获取年终奖”，真的有效吗？专题四：工作时间与休息休假 1.每周6天，每天7小时，究竟加班了2小时还是7小时？ 2.工作日停电停工休息，能否要求员工周日上班，补回停工休息日？ 3.综合工时下，法定节假日是否属于总的工作时间内？ 4.病假、医疗期、工伤假的享受条件及风险管控； 5.如何预防与应对员工泡病假？ 6.产假、年休假、婚丧假的享受条件及风险管控； 7.实习生、反聘人员能否享受年休假？ 8.用人单位是否必须批准员工请事假？ 9.请事假，当月工资是以实际出勤天数计算还是以工资总额减去缺勤天数计算？专题五：经济补偿 1.用人单位需向劳动者支付经济补偿的情形有哪些？ 2.什么情况下用人单位需支付两倍的经济补偿？ 3.违法解除下是否存在代通知金？ 4.劳动者可否同时向用人单位主张经济补偿和赔偿金？ 5.经济补偿计算的基数及标准如何确定？ 6. 解除前12个月内员工休过医疗期，其平均工资如何认定？ 7.经济补偿年限最高不超过十二年的适用范围？ 8.如何计算《劳动合同法》生效前后的经济补偿年限？ 9.如何理解“六个月以上不满一年的，按一年计算；不满六个月的，支付半个月工资的经济补偿”？专题六：规章制度与员工手册 1.企业人力资源、劳动用工管理制度常见的误区有哪些？ 2.人力资源、劳动用工管理制度应该包括哪些必备内容？ 3.制定规章制度的程序要求给用人单位带来哪些风险，如何应对？ 4.非国有用人单位如何组建“职工代表大会”？ 5.二级单位的员工是否有义务遵守集团公司的规章制度？ 6.如何公示或告知，更符合仲裁或诉讼的举证要求？ 7.规章制度能否规定对员工进行经济处罚？ 8.规章制度违反法律法规，劳动者可以被迫解除并索取经济补偿，如何防范？ 9.规章制度与员工手册到底有什么区别？ 10．规章制度与员工手册应该多长时间修改一次？专题七：工伤保险条例 1.属于工伤范围的情形有哪些？ 2.不得认定为工伤的情形有哪些？ 3.员工工作应酬喝酒身亡，是否属于工伤？ 4.无照驾驶与驾驶无照车辆受伤，能否认定为工伤? 5.怎样理解“上下班途中”，怎样控制期间的风险？ 6.发生工伤事故，用人单位需承担哪些费用？ 7.对于第三方造成的工伤事故，劳动者能否要求用人单位支付工伤待遇又同时要求第三方支付人身伤害赔偿？ 8.用人单位能否以商业保险理赔款替代职工工伤赔偿待遇？ 9.发生工伤事故，双方私下和解，补偿协议该如何签订才有效？专题八：劳务派遣与业务外包 1.新法下劳务派遣面临的主要风险有哪些？ 2.劳务派遣合作协议必须注意的风险细节有哪些？ 3.派遣工“第三签”时，能否要求签订无固定期限劳动合同？ 4.哪些岗位可以使用派遣工，辅助性、临时性、替代性如何理解与操作？ 5.新规定对于同工同酬提出哪些新要求，如何规避同工同酬风险？ 6.用工单位如何行使对派遣员工的退还或退换权？ 7.部分劳务公司很可能面临关闭停业，原来的派遣工的劳动关系如何处理？ 8.业务外包与劳务派遣的本质区别有哪些？ 9.用工单位如何应对派遣合作争议和劳动争议？ 10.如何避免与劳务派遣工或承包方员工形成双重劳动关系？【讲师简介】钟永棣老师国内著名劳动法、劳动关系与劳动争议实战专家；劳动仲裁员、企业劳动争议预防应对专家、高级人力资源管理师、高级劳动关系协调师；国内第一批倡导、传播、实施“国家劳动法与企业薪酬绩效管理有机整合”的先行者；国内原创型、实战型、顾问型的培训师。　　现任劳律通法律顾问服务中心首席顾问、创世纪培训网首席劳动法讲师\顾问、广州市劳动保障学会副会长兼秘书长；兼任时代光华、深圳外商投资企业协会、广州市人力资源市场服务中心、广州市就业训练中心、广东省人力资源管理协会、香港工业总会、中山大学、浙江大学、华南理工大学等200多家培训公司、行业协会、有关机构单位的长期签约讲师\特聘顾问。　　科班出身的钟老师，2000年至今一直从事与劳动法、劳动关系与劳动争议有关的工作；曾任劳动行政部门专职劳动仲裁员，曾获“广州市优秀劳动仲裁员”称号，期间审裁劳动争议案件400多宗；多年来累计代理劳动争议500多宗，参与薪酬绩效咨询项目20多个，审查完善400多家企业的人力资源管理规章制度。个人长期担任30多家（累计200多家）企业单位的人力资源管理法律顾问；以钟老师领衔的专家队伍，长期为企事业单位提供劳动法常年顾问及各种劳资专项咨询服务，客户满意度高达95%。 2008年至今，钟老师每年授课约100-130天。钟老师将枯燥的劳动政策法规溶入实际管理案例当中，将人力资源管理与劳动法有机地整合在一起；课程内容80%为真实案例、20%为必备的重点法条；学员参与讨论、互动，课程生动有趣，深入浅出，实战型超强，让学员即时学以致用！课程满意度高达95%，众多学员均表示：“第一次听到如此实战、实用、实效的劳动法课程！钟老师非常务实、不说教、没有商业味道，终于听到了让我不再后悔的精彩课程！” 钟老师先后在《广州日报》《南方都市报》《中国社会科学报》《人力资源》《香港工业总会月刊》等报刊、杂志、媒体发表专业文章或采访稿100多篇。【课程报名】我单位共人确定报名参加 2017年月日在举办的《行政服务创新与行政统筹管理》培训班。单位名称: 地址: 联系人姓名:性别: 手机:电话: 部门/职务:E-mail: 参会学员信息姓名性别职位手机E-mail金额缴费方式 □ 转帐 □ 现金住宿要求预定：双人房间；单人房间，住宿时间：月至日 (不用预定请留空) 报名联系：程先生电话：177-1554-3974 报名邮箱：384631378(a)qq.com （报名请填写以上信息并发送至该邮箱。我们将在一个工作日内回复，未及时回复请您电话联系，谢谢。）河南洛阳协和医院投资管理有限公司目前已在国内外及河河南洛阳协和医院投资管理有限公司目前已在国内外及河河南洛阳协和医院投资管理有限公司目前已在国内外及河河南洛阳协和医院投资管理有限公司目前已在国内外及河河南洛阳协和医院投资管理有限公司目前已在国内外及河河南洛阳协和医院投资管理有限公司目前已在国内外及河

1 0

test
by info4＠info.dfgadf.top 20 Jun '19

20 Jun '19

1 0

[PATCH-next v2] setup.py: refactoring code for next
by jurbanov＠redhat.com 19 Jun '19

19 Jun '19

From: Jozef Urbanovsky <jurbanov(a)redhat.com> deleted obsolete code, referencing lnst-ctl, recipes, xslt results and test tools added install_requires with python dependencies Signed-off-by: Jozef Urbanovsky <jurbanov(a)redhat.com> --- setup.py | 151 +++++++++++++++---------------------------------------- 1 file changed, 41 insertions(+), 110 deletions(-) diff --git a/setup.py b/setup.py index 2a6a491..ad8bfa7 100755 --- a/setup.py +++ b/setup.py @@ -1,30 +1,26 @@ #!/usr/bin/env python3 + """ Install script for lnst -This script will install both lnst controller and slave -to your system. To install LNST, execute it as follows: +This script will install LNST to your system. +To install LNST, execute it as follows: - ./setup.py install + pip3 install . To install lnst to a different root use: - .setup.py install --root=<path> - -""" + pip3 install --prefix <path> . -__author__ = """ -rpazdera(a)redhat.com (Radek Pazdera) """ -import sys import re import gzip -import os from time import gmtime, strftime from setuptools import setup, find_packages from lnst.Common.Version import lnst_version + def process_template(template_path, values): template_name_re = "\.in$" if not re.search(template_name_re, template_path): @@ -40,6 +36,7 @@ def process_template(template_path, values): f.close() t.close() + def gzip_file(path): src = open(path, "rb") dst = gzip.open(path + ".gz", "wb") @@ -47,13 +44,12 @@ def gzip_file(path): dst.close() src.close() + # Various paths CONF_DIR = "/etc/" BASH_COMP_DIR = CONF_DIR + "bash_completion.d/" MAN_DIR = "/usr/share/man/man1/" -CTL_MODULES_LOCATIONS = "/usr/share/lnst/test_modules/" -CTL_TOOLS_LOCATIONS = "/usr/share/lnst/test_tools/" CTL_RESOURCE_DIR = "/usr/share/lnst/" CTL_LOGS_DIR = "~/.lnst/logs/" @@ -62,26 +58,22 @@ SLAVE_CACHE_DIR = "/var/cache/lnst" # Process templated files TEMPLATES_VALUES = { -"conf_dir": CONF_DIR, -"man_dir": MAN_DIR, + "conf_dir": CONF_DIR, + "man_dir": MAN_DIR, -"ctl_modules_locations": CTL_MODULES_LOCATIONS, -"ctl_tools_locations": CTL_TOOLS_LOCATIONS, -"ctl_resource_dir": CTL_RESOURCE_DIR, -"ctl_logs_dir": CTL_LOGS_DIR, + "ctl_resource_dir": CTL_RESOURCE_DIR, + "ctl_logs_dir": CTL_LOGS_DIR, -"slave_logs_dir": SLAVE_LOGS_DIR, -"slave_cache_dir": SLAVE_CACHE_DIR, + "slave_logs_dir": SLAVE_LOGS_DIR, + "slave_cache_dir": SLAVE_CACHE_DIR, -"date": strftime("%Y-%m-%d", gmtime()) + "date": strftime("%Y-%m-%d", gmtime()) } TEMPLATES = [ -"install/lnst-ctl.conf.in", -"install/lnst-slave.conf.in", -"install/lnst-ctl.1.in", -"install/lnst-slave.1.in", -"install/lnst-pool-wizard.1.in" + "install/lnst-ctl.conf.in", + "install/lnst-slave.conf.in", + "install/lnst-slave.1.in", ] for template in TEMPLATES: @@ -89,12 +81,9 @@ for template in TEMPLATES: # --- # Pack man pages -gzip_file("install/lnst-ctl.1") gzip_file("install/lnst-slave.1") -gzip_file("install/lnst-pool-wizard.1") # --- - LONG_DESC = """LNST Linux Network Stack Test is a tool that supports development and execution @@ -104,92 +93,34 @@ For detailed description of the architecture of LNST please refer to project website <https://fedorahosted.org/lnst>. """ -SCRIPTS = ["lnst-ctl", "lnst-slave", "lnst-pool-wizard"] - -RECIPE_FILES = [] -for dirpath, dirnames, files in os.walk("recipes/"): - if len(files) > 0: - RECIPE_FILES.append((CTL_RESOURCE_DIR + dirpath + "/", - [dirpath + "/" + f for f in files])) - -TEST_MODULES = [ - (CTL_MODULES_LOCATIONS, - ["test_modules/DummyFailing.py", - "test_modules/Icmp6Ping.py", - "test_modules/IcmpPing.py", - "test_modules/Iperf.py", - "test_modules/Multicast.py", - "test_modules/NetCat.py", - "test_modules/Netperf.py", - "test_modules/PacketAssert.py", - "test_modules/PktCounter.py", - "test_modules/PktgenTx.py", - "test_modules/LinkNeg.py", - "test_modules/Custom.py"] - ) -] +SCRIPTS = ["lnst-slave"] -MULTICAST_TEST_TOOLS = [ - (CTL_TOOLS_LOCATIONS + "multicast", - ["test_tools/multicast/igmp_utils.h", - "test_tools/multicast/lnst-setup.sh", - "test_tools/multicast/Makefile", - "test_tools/multicast/multicast_utils.h", - "test_tools/multicast/parameters_igmp.h", - "test_tools/multicast/parameters_multicast.h", - "test_tools/multicast/README", - "test_tools/multicast/sockopt_utils.h"]), - (CTL_TOOLS_LOCATIONS + "multicast/client", - ["test_tools/multicast/client/send_igmp_query.c", - "test_tools/multicast/client/send_simple.c"]), - (CTL_TOOLS_LOCATIONS + "multicast/offline", - ["test_tools/multicast/offline/max_groups.c", - "test_tools/multicast/offline/sockopt_block_source.c", - "test_tools/multicast/offline/sockopt_if.c", - "test_tools/multicast/offline/sockopt_loop.c", - "test_tools/multicast/offline/sockopt_membership.c", - "test_tools/multicast/offline/sockopt_source_membership.c", - "test_tools/multicast/offline/sockopt_ttl.c"]), - (CTL_TOOLS_LOCATIONS + "multicast/server", - ["test_tools/multicast/server/recv_block_source.c", - "test_tools/multicast/server/recv_membership.c", - "test_tools/multicast/server/recv_simple.c", - "test_tools/multicast/server/recv_source_membership.c"]), - (CTL_TOOLS_LOCATIONS + "tcp_conn", - ["test_tools/tcp_conn/lnst-setup.sh", - "test_tools/tcp_conn/Makefile", - "test_tools/tcp_conn/tcp_connect.c", - "test_tools/tcp_conn/tcp_listen.c"]) -] - -MAN_PAGES = [(MAN_DIR, ["install/lnst-ctl.1.gz", "install/lnst-slave.1.gz", - "install/lnst-pool-wizard.1.gz"])] +MAN_PAGES = [(MAN_DIR, ["install/lnst-slave.1.gz"])] CONFIG = [(CONF_DIR, ["install/lnst-ctl.conf", "install/lnst-slave.conf"])] -BASH_COMP = [(BASH_COMP_DIR, ["install/lnst-ctl.bash", - "install/lnst-slave.bash", - "install/lnst-pool-wizard.bash"])] - -SCHEMAS = [(CTL_RESOURCE_DIR, ["schema-recipe.rng", "schema-sm.rng"])] +BASH_COMP = [(BASH_COMP_DIR, ["install/lnst-slave.bash"])] -RESULT_XSLT_DATA = [(CTL_RESOURCE_DIR + "result_xslt/", - ["result_xslt/" + f for f in os.listdir("result_xslt")])] +SCHEMAS = [(CTL_RESOURCE_DIR, ["schema-sm.rng"])] -DATA_FILES = CONFIG + TEST_MODULES + MULTICAST_TEST_TOOLS + MAN_PAGES + \ - SCHEMAS + BASH_COMP + RECIPE_FILES + RESULT_XSLT_DATA +DATA_FILES = CONFIG + MAN_PAGES + SCHEMAS + BASH_COMP setup(name="lnst", - version=lnst_version.version, - description="Linux Network Stack Test", - author="LNST Team", - author_email="lnst-developers(a)lists.fedorahosted.org", - maintainer="Jiri Pirko", - maintainer_email="jiri(a)resnulli.us", - url="http://lnst-project.org", - long_description=LONG_DESC, - platforms=["linux"], - license=["GNU GPLv2"], - packages=find_packages(), - scripts=SCRIPTS, - data_files=DATA_FILES) + version=lnst_version.version, + description="Linux Network Stack Test", + author="LNST Team", + author_email="lnst-developers(a)lists.fedorahosted.org", + maintainer="Ondrej Lichtner", + maintainer_email="olichtne(a)redhat.com", + url="http://lnst-project.org", + long_description=LONG_DESC, + platforms=["linux"], + license=["GNU GPLv2"], + packages=find_packages(), + install_requires=[ + 'pyyaml', + 'lxml', + 'pyroute2', + 'libvirt-python'], + scripts=SCRIPTS, + data_files=DATA_FILES) -- 2.21.0

4 4

电邮营销好帮手---日群发30万邮箱只需500元一月---QQ咨询：3351665625
by 电邮营销好帮手---日群发30万邮箱只需500元一月---QQ咨询：3351665625 15 Jun '19

15 Jun '19

  电邮营销好帮手---日群发30万邮箱只需500元一月 QQ咨询：3351665625

1 0

狼性销售27
by 吴晓娟 14 Jun '19

14 Jun '19

1 0

[PATCH-next v2 00/18] refactor of lnst.Recipes.ENRT recipes, configuration descriptions
by olichtne＠redhat.com 13 Jun '19

13 Jun '19

From: Ondrej Lichtner <olichtne(a)redhat.com> Hi, sending a v2 of this patchset that changes the name of the parent variables to desc in the description generation methods. In addition to that this patch set has additional 3 patches at the end that fix some minor issues I overlooked. -Ondrej Original cover letter: Hi, This patchset deals with the refactoring of the ENRT recipes, for now this specifically means the BaseEnrtRecipe and the SimplePerfRecipe. The refactor utilizes Pythons' collaborative inheritance to enable highly flexible way of extending the basic functionality of the recipe with additional configuration parameters and implementation. Yesterday I spent about an hour explaining this to my colleagues at RH through a bluejeans call, I'm sharing the recording here in case anyone else is also interested: https://bluejeans.com/s/gAZXd The patchset probably breaks some minor functionality of all the other recipes that we currently have in the ENRT package, but I expect that in general they could actually still work reasonably well, or need just small changes to get working again. As this is a proposal I didn't want to waste time with reworking the other recipes as well, if we accept this, updating them should be the next patchset after this one. -Ondrej Ondrej Lichtner (18): add lnst.Recipes.ENRT.ConfigMixins package lnst.Recipes.ENRT.BaseEnrtRecipe: refactor test method with contextmanagers lnst.Recipes.ENRT.BaseEnrtRecipe: add config description generators lnst.Recipes.ENRT.BaseEnrtRecipe: move sub configuration into mixins lnst.Recipes.ENRT.BaseEnrtRecipe: remove the EnrtSubConfiguration class lnst.Recipes.ENRT.BaseEnrtRecipe: refactor the ping/perf test loops lnst.Recipes.ENRT.BaseEnrtRecipe: remove EnrtConfiguration attributes lnst.Recipes.ENRT.BaseEnrtRecipe: remove _pin_dev_interrupts method lnst.Recipes.ENRT.BaseEnrtRecipe: cosmetic changes lnst.Recipes.ENRT.SimplePerfRecipe: add ping/perf endpoint generators lnst.Recipes.ENRT.SimplePerfRecipe: add test wide description generation add ConfigMixins.OffloadSubConfigMixin module, enable for SimplePerfRecipe add lnst.Recipes.ENRT.ConfigMixins.BaseHWConfigMixin hierarchy lnst.Recipes.ENRT.SimplePerfRecipe: use CommonHWConfigMixin by inheritance lnst.Recipes.ENRT.SimplePerfRecipe: implement wait_tentative_ips lnst.RecipeCommon.Perf.Evaluators.BaselineEvaluator: fix return value type lnst.Recipes.ENRT.BaseEnrtRecipe: provide only recipe config to the Perf sub-recipe lnst.RecipeCommon.Perf.Measurements.IperfFlowMeasurement: lower job level for --version call .../Perf/Evaluators/BaselineEvaluator.py | 2 +- .../Perf/Measurements/IperfFlowMeasurement.py | 2 +- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 449 +++++++----------- .../ENRT/ConfigMixins/BaseHWConfigMixin.py | 42 ++ .../ENRT/ConfigMixins/BaseSubConfigMixin.py | 12 + .../ConfigMixins/CoalescingHWConfigMixin.py | 32 ++ .../ENRT/ConfigMixins/CommonHWConfigMixin.py | 31 ++ .../ConfigMixins/DevInterruptHWConfigMixin.py | 102 ++++ .../ENRT/ConfigMixins/MTUHWConfigMixin.py | 18 + .../ConfigMixins/OffloadSubConfigMixin.py | 103 ++++ .../ParallelStreamQDiscHWConfigMixin.py | 32 ++ lnst/Recipes/ENRT/ConfigMixins/__init__.py | 0 lnst/Recipes/ENRT/SimplePerfRecipe.py | 83 ++-- 13 files changed, 588 insertions(+), 320 deletions(-) create mode 100644 lnst/Recipes/ENRT/ConfigMixins/BaseHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/CoalescingHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/CommonHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/DevInterruptHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/MTUHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/OffloadSubConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/ParallelStreamQDiscHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/__init__.py -- 2.22.0

3 20

[PATCH-next 00/15] refactor of lnst.Recipes.ENRT recipes, configuration descriptions
by olichtne＠redhat.com 13 Jun '19

13 Jun '19

From: Ondrej Lichtner <olichtne(a)redhat.com> Hi, This patchset deals with the refactoring of the ENRT recipes, for now this specifically means the BaseEnrtRecipe and the SimplePerfRecipe. The refactor utilizes Pythons' collaborative inheritance to enable highly flexible way of extending the basic functionality of the recipe with additional configuration parameters and implementation. Yesterday I spent about an hour explaining this to my colleagues at RH through a bluejeans call, I'm sharing the recording here in case anyone else is also interested: https://bluejeans.com/s/gAZXd The patchset probably breaks some minor functionality of all the other recipes that we currently have in the ENRT package, but I expect that in general they could actually still work reasonably well, or need just small changes to get working again. As this is a proposal I didn't want to waste time with reworking the other recipes as well, if we accept this, updating them should be the next patchset after this one. -Ondrej Ondrej Lichtner (15): add lnst.Recipes.ENRT.ConfigMixins package lnst.Recipes.ENRT.BaseEnrtRecipe: refactor test method with contextmanagers lnst.Recipes.ENRT.BaseEnrtRecipe: add config description generators lnst.Recipes.ENRT.BaseEnrtRecipe: move sub configuration into mixins lnst.Recipes.ENRT.BaseEnrtRecipe: remove the EnrtSubConfiguration class lnst.Recipes.ENRT.BaseEnrtRecipe: refactor the ping/perf test loops lnst.Recipes.ENRT.BaseEnrtRecipe: remove EnrtConfiguration attributes lnst.Recipes.ENRT.BaseEnrtRecipe: remove _pin_dev_interrupts method lnst.Recipes.ENRT.BaseEnrtRecipe: cosmetic changes lnst.Recipes.ENRT.SimplePerfRecipe: add ping/perf endpoint generators lnst.Recipes.ENRT.SimplePerfRecipe: add test wide description generation add ConfigMixins.OffloadSubConfigMixin module, enable for SimplePerfRecipe add lnst.Recipes.ENRT.ConfigMixins.BaseHWConfigMixin hierarchy lnst.Recipes.ENRT.SimplePerfRecipe: use CommonHWConfigMixin by inheritance lnst.Recipes.ENRT.SimplePerfRecipe: implement wait_tentative_ips lnst/Recipes/ENRT/BaseEnrtRecipe.py | 450 +++++++----------- .../ENRT/ConfigMixins/BaseHWConfigMixin.py | 42 ++ .../ENRT/ConfigMixins/BaseSubConfigMixin.py | 12 + .../ConfigMixins/CoalescingHWConfigMixin.py | 32 ++ .../ENRT/ConfigMixins/CommonHWConfigMixin.py | 31 ++ .../ConfigMixins/DevInterruptHWConfigMixin.py | 102 ++++ .../ENRT/ConfigMixins/MTUHWConfigMixin.py | 18 + .../ConfigMixins/OffloadSubConfigMixin.py | 103 ++++ .../ParallelStreamQDiscHWConfigMixin.py | 32 ++ lnst/Recipes/ENRT/ConfigMixins/__init__.py | 0 lnst/Recipes/ENRT/SimplePerfRecipe.py | 83 ++-- 11 files changed, 587 insertions(+), 318 deletions(-) create mode 100644 lnst/Recipes/ENRT/ConfigMixins/BaseHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/BaseSubConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/CoalescingHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/CommonHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/DevInterruptHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/MTUHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/OffloadSubConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/ParallelStreamQDiscHWConfigMixin.py create mode 100644 lnst/Recipes/ENRT/ConfigMixins/__init__.py -- 2.22.0

3 23

[PATCH-next] setup.py: refactoring code for next
by jurbanov＠redhat.com 13 Jun '19

13 Jun '19

From: Jozef Urbanovsky <jurbanov(a)redhat.com> deleted obsolete code, referencing lnst-ctl, recipes, xslt results and test tools added install_requires with python dependencies Signed-off-by: Jozef Urbanovsky <jurbanov(a)redhat.com> --- setup.py | 151 +++++++++++++++++-------------------------------------- 1 file changed, 45 insertions(+), 106 deletions(-) diff --git a/setup.py b/setup.py index 2a6a491..33aacd6 100755 --- a/setup.py +++ b/setup.py @@ -1,30 +1,31 @@ #!/usr/bin/env python3 + """ Install script for lnst -This script will install both lnst controller and slave -to your system. To install LNST, execute it as follows: +This script will install LNST to your system. +To install LNST, execute it as follows: - ./setup.py install + pip3 install . To install lnst to a different root use: - .setup.py install --root=<path> + pip3 install --prefix <path> . """ __author__ = """ rpazdera(a)redhat.com (Radek Pazdera) +jurbanov(a)redhat.com (Jozef Urbanovsky) """ -import sys import re import gzip -import os from time import gmtime, strftime from setuptools import setup, find_packages from lnst.Common.Version import lnst_version + def process_template(template_path, values): template_name_re = "\.in$" if not re.search(template_name_re, template_path): @@ -40,6 +41,7 @@ def process_template(template_path, values): f.close() t.close() + def gzip_file(path): src = open(path, "rb") dst = gzip.open(path + ".gz", "wb") @@ -47,13 +49,12 @@ def gzip_file(path): dst.close() src.close() + # Various paths CONF_DIR = "/etc/" BASH_COMP_DIR = CONF_DIR + "bash_completion.d/" MAN_DIR = "/usr/share/man/man1/" -CTL_MODULES_LOCATIONS = "/usr/share/lnst/test_modules/" -CTL_TOOLS_LOCATIONS = "/usr/share/lnst/test_tools/" CTL_RESOURCE_DIR = "/usr/share/lnst/" CTL_LOGS_DIR = "~/.lnst/logs/" @@ -62,26 +63,22 @@ SLAVE_CACHE_DIR = "/var/cache/lnst" # Process templated files TEMPLATES_VALUES = { -"conf_dir": CONF_DIR, -"man_dir": MAN_DIR, + "conf_dir": CONF_DIR, + "man_dir": MAN_DIR, -"ctl_modules_locations": CTL_MODULES_LOCATIONS, -"ctl_tools_locations": CTL_TOOLS_LOCATIONS, -"ctl_resource_dir": CTL_RESOURCE_DIR, -"ctl_logs_dir": CTL_LOGS_DIR, + "ctl_resource_dir": CTL_RESOURCE_DIR, + "ctl_logs_dir": CTL_LOGS_DIR, -"slave_logs_dir": SLAVE_LOGS_DIR, -"slave_cache_dir": SLAVE_CACHE_DIR, + "slave_logs_dir": SLAVE_LOGS_DIR, + "slave_cache_dir": SLAVE_CACHE_DIR, -"date": strftime("%Y-%m-%d", gmtime()) + "date": strftime("%Y-%m-%d", gmtime()) } TEMPLATES = [ -"install/lnst-ctl.conf.in", -"install/lnst-slave.conf.in", -"install/lnst-ctl.1.in", -"install/lnst-slave.1.in", -"install/lnst-pool-wizard.1.in" + "install/lnst-ctl.conf.in", + "install/lnst-slave.conf.in", + "install/lnst-slave.1.in", ] for template in TEMPLATES: @@ -89,12 +86,9 @@ for template in TEMPLATES: # --- # Pack man pages -gzip_file("install/lnst-ctl.1") gzip_file("install/lnst-slave.1") -gzip_file("install/lnst-pool-wizard.1") # --- - LONG_DESC = """LNST Linux Network Stack Test is a tool that supports development and execution @@ -104,92 +98,37 @@ For detailed description of the architecture of LNST please refer to project website <https://fedorahosted.org/lnst>. """ -SCRIPTS = ["lnst-ctl", "lnst-slave", "lnst-pool-wizard"] - -RECIPE_FILES = [] -for dirpath, dirnames, files in os.walk("recipes/"): - if len(files) > 0: - RECIPE_FILES.append((CTL_RESOURCE_DIR + dirpath + "/", - [dirpath + "/" + f for f in files])) - -TEST_MODULES = [ - (CTL_MODULES_LOCATIONS, - ["test_modules/DummyFailing.py", - "test_modules/Icmp6Ping.py", - "test_modules/IcmpPing.py", - "test_modules/Iperf.py", - "test_modules/Multicast.py", - "test_modules/NetCat.py", - "test_modules/Netperf.py", - "test_modules/PacketAssert.py", - "test_modules/PktCounter.py", - "test_modules/PktgenTx.py", - "test_modules/LinkNeg.py", - "test_modules/Custom.py"] - ) -] - -MULTICAST_TEST_TOOLS = [ - (CTL_TOOLS_LOCATIONS + "multicast", - ["test_tools/multicast/igmp_utils.h", - "test_tools/multicast/lnst-setup.sh", - "test_tools/multicast/Makefile", - "test_tools/multicast/multicast_utils.h", - "test_tools/multicast/parameters_igmp.h", - "test_tools/multicast/parameters_multicast.h", - "test_tools/multicast/README", - "test_tools/multicast/sockopt_utils.h"]), - (CTL_TOOLS_LOCATIONS + "multicast/client", - ["test_tools/multicast/client/send_igmp_query.c", - "test_tools/multicast/client/send_simple.c"]), - (CTL_TOOLS_LOCATIONS + "multicast/offline", - ["test_tools/multicast/offline/max_groups.c", - "test_tools/multicast/offline/sockopt_block_source.c", - "test_tools/multicast/offline/sockopt_if.c", - "test_tools/multicast/offline/sockopt_loop.c", - "test_tools/multicast/offline/sockopt_membership.c", - "test_tools/multicast/offline/sockopt_source_membership.c", - "test_tools/multicast/offline/sockopt_ttl.c"]), - (CTL_TOOLS_LOCATIONS + "multicast/server", - ["test_tools/multicast/server/recv_block_source.c", - "test_tools/multicast/server/recv_membership.c", - "test_tools/multicast/server/recv_simple.c", - "test_tools/multicast/server/recv_source_membership.c"]), - (CTL_TOOLS_LOCATIONS + "tcp_conn", - ["test_tools/tcp_conn/lnst-setup.sh", - "test_tools/tcp_conn/Makefile", - "test_tools/tcp_conn/tcp_connect.c", - "test_tools/tcp_conn/tcp_listen.c"]) -] +SCRIPTS = ["lnst-slave"] -MAN_PAGES = [(MAN_DIR, ["install/lnst-ctl.1.gz", "install/lnst-slave.1.gz", - "install/lnst-pool-wizard.1.gz"])] +MAN_PAGES = [(MAN_DIR, ["install/lnst-slave.1.gz"])] CONFIG = [(CONF_DIR, ["install/lnst-ctl.conf", "install/lnst-slave.conf"])] -BASH_COMP = [(BASH_COMP_DIR, ["install/lnst-ctl.bash", - "install/lnst-slave.bash", - "install/lnst-pool-wizard.bash"])] - -SCHEMAS = [(CTL_RESOURCE_DIR, ["schema-recipe.rng", "schema-sm.rng"])] +BASH_COMP = [(BASH_COMP_DIR, ["install/lnst-slave.bash"])] -RESULT_XSLT_DATA = [(CTL_RESOURCE_DIR + "result_xslt/", - ["result_xslt/" + f for f in os.listdir("result_xslt")])] +SCHEMAS = [(CTL_RESOURCE_DIR, ["schema-sm.rng"])] -DATA_FILES = CONFIG + TEST_MODULES + MULTICAST_TEST_TOOLS + MAN_PAGES + \ - SCHEMAS + BASH_COMP + RECIPE_FILES + RESULT_XSLT_DATA +DATA_FILES = CONFIG + MAN_PAGES + SCHEMAS + BASH_COMP setup(name="lnst", - version=lnst_version.version, - description="Linux Network Stack Test", - author="LNST Team", - author_email="lnst-developers(a)lists.fedorahosted.org", - maintainer="Jiri Pirko", - maintainer_email="jiri(a)resnulli.us", - url="http://lnst-project.org", - long_description=LONG_DESC, - platforms=["linux"], - license=["GNU GPLv2"], - packages=find_packages(), - scripts=SCRIPTS, - data_files=DATA_FILES) + version=lnst_version.version, + description="Linux Network Stack Test", + author="LNST Team", + author_email="lnst-developers(a)lists.fedorahosted.org", + maintainer="Ondrej Lichtner", + maintainer_email="olichtne(a)redhat.com", + url="http://lnst-project.org", + long_description=LONG_DESC, + platforms=["linux"], + license=["GNU GPLv2"], + packages=find_packages(), + install_requires=['pyyaml', + 'lxml', + 'requests', + 'urllib3', + 'pyroute2', + 'pyOpenSSL', + 'coreapi', + 'libvirt-python'], + scripts=SCRIPTS, + data_files=DATA_FILES) -- 2.21.0

3 2

[PATCH-next 0/9] Various next branch updates
by olichtne＠redhat.com 11 Jun '19

11 Jun '19

From: Ondrej Lichtner <olichtne(a)redhat.com> Hi, the following patchset is a collection of various minor fixes and a semi large refactoring of the netlink related methods of the Device class hierarchy. These were implemented as a preparation for the following patchset that refactors and redesigns the ENRT recipes hierarchy to both enable a more flexible recipe design and to enable an easy generation of test_wide configuration and sub configuration descriptions. -Ondrej Ondrej Lichtner (9): lnst.Tests.Ping: don't fail due to stderr lnst.Devices.Device: refactor nl_sync methods lnst.Controller.Job: add host info to __str__ lnst.Controller.RecipeResults: reduce the level of DeviceConfigResults lnst.Devices.Device: minor adaptive coalescing improvement lnst.Common.IpAddress: add flags attribute lnst.Common.IpAddress: add is_tentative attribute lnst.Devices.Device: add flags to parsed ip addresses lnst.Controller.RecipeControl: add timeout parameter to wait_for_condition lnst/Common/IpAddress.py | 28 +++++--- lnst/Controller/Job.py | 2 + lnst/Controller/RecipeControl.py | 4 +- lnst/Controller/RecipeResults.py | 2 +- lnst/Devices/BondDevice.py | 52 +++++++-------- lnst/Devices/BridgeDevice.py | 6 +- lnst/Devices/Device.py | 109 +++++++++++++------------------ lnst/Devices/MacvlanDevice.py | 4 +- lnst/Devices/SoftDevice.py | 2 +- lnst/Devices/VethDevice.py | 2 +- lnst/Devices/VlanDevice.py | 4 +- lnst/Devices/VtiDevice.py | 10 +-- lnst/Devices/VxlanDevice.py | 10 +-- lnst/Tests/Ping.py | 1 - 14 files changed, 114 insertions(+), 122 deletions(-) -- 2.22.0

3 11

[PATCH-next 0/3] Test set completeness patch set No 1
by csfakian＠redhat.com 11 Jun '19

11 Jun '19

From: Christos Sfakianakis <csfakian(a)redhat.com> Hi, this patchset is the first in a potential series relating to the complete recipe set. It handles issues popped up after python2->3 move, reduces code repetition in recipes and addresses generic recipe bugs. Christos Christos Sfakianakis (3): lnst.{Recipes.ENRT,Tests}: fixes with respect to python 3 switch lnst.{Recipes.ENRT,RecipeCommon}: remove unnecessary code, fix typos, names, logical errors, mtu setters lnst.Recipes.ENRT: reduce code repetition .../Perf/Measurements/IperfFlowMeasurement.py | 4 +- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 6 +- lnst/Recipes/ENRT/BondRecipe.py | 28 ++++---- lnst/Recipes/ENRT/DoubleBondRecipe.py | 28 ++++---- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 47 +++++-------- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 11 +-- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 17 ++--- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 14 ++-- lnst/Recipes/ENRT/PingFloodRecipe.py | 11 +-- .../ENRT/ShortLivedConnectionsRecipe.py | 11 +-- lnst/Recipes/ENRT/SimpleMacsecRecipe.py | 7 +- lnst/Recipes/ENRT/SimplePerfRecipe.py | 12 ++-- lnst/Recipes/ENRT/TeamRecipe.py | 21 +++--- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 36 ++++------ lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 13 ++-- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 52 ++++++-------- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 35 ++++------ .../VirtualBridgeVlanInHostMirroredRecipe.py | 43 +++++------- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 26 +++---- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 34 +++------- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 62 ++++++----------- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 34 ++++------ ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 43 +++++------- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 26 +++---- .../VirtualOvsBridgeVlansOverBondRecipe.py | 67 +++++-------------- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 30 ++++----- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 21 ++---- lnst/Recipes/ENRT/VlansRecipe.py | 12 ++-- lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 26 +++---- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 11 ++- lnst/Recipes/ENRT/XfrmTools.py | 4 +- lnst/Tests/PacketAssert.py | 4 +- 32 files changed, 286 insertions(+), 510 deletions(-) -- 2.17.1

2 6

[PATCH-next v2 0/1] Differentiate between physical, soft and virtual devices
by csfakian＠redhat.com 11 Jun '19

11 Jun '19

From: Christos Sfakianakis <csfakian(a)redhat.com> Hi, this is version 2 of the patch. The difference with respect to the first version is the transfer of the cover letter's use case description into the commit's message. Christos Christos Sfakianakis (1): lnst.Devices.Device: customize instance checks to support categorization lnst/Devices/Device.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.17.1

2 2

[PATCH-next 00/15] log improvements
by olichtne＠redhat.com 11 Jun '19

11 Jun '19

From: Ondrej Lichtner <olichtne(a)redhat.com> Hi all, this patch series starts my effort to improve the logs as provided to the tester. This patchset is centered at removing the need of the tester to use debug=1 logging and still know what's happening wrt. the recipe he's trying to run. This means a significant reduction of logs on the Controller side which in my personal opinion improves usability quite a bit. Next I want to focus on improving the BaseEnrtRecipe hierarchy and include capabilities that provide some additional context as to what stage the test execution is at. -Ondrej Ondrej Lichtner (15): lnst.Common.ExecCmd: fix cmd not being part of the exception description add __repr__ and __str__ implementations of several objects lnst.Controller.RecipeResults: remove useless property redefines lnst.Controller.RecipeResults: add success setter lnst.Controller.Machine: ensure Job{Start, Finish}Result ordering lnst.Devices.RemoteDevice: add _id property lnst.Controller.RecipeResults: add DeviceConfigResult.* classes lnst.Controller.Machine: add stop_recipe lnst.Controller.RunSummaryFormatter: change default source string lnst.Controller.Job: add a 'type' property lnst.Controller.Job: __str__ method format of _what description lnst.Controller.Machine: add device manipulation methods lnst.RecipeCommon.Perf: add flow information to string reports adjust logging levels lnst.Controller.Recipe: log results as they're added lnst/Common/ExecCmd.py | 3 +- lnst/Common/IpAddress.py | 3 + lnst/Controller/Controller.py | 1 + lnst/Controller/Host.py | 1 + lnst/Controller/Job.py | 35 ++--- lnst/Controller/Machine.py | 74 ++++++++-- lnst/Controller/Namespace.py | 10 +- lnst/Controller/Recipe.py | 15 ++ lnst/Controller/RecipeResults.py | 134 ++++++++++++++++-- lnst/Controller/RunSummaryFormatter.py | 6 +- lnst/Devices/RemoteDevice.py | 41 ++++-- .../BaselineFlowAverageEvaluator.py | 3 +- .../Perf/Evaluators/NonzeroFlowEvaluator.py | 5 +- .../Perf/Measurements/BaseFlowMeasurement.py | 28 ++++ .../Perf/Measurements/BaseMeasurement.py | 6 + .../Perf/Measurements/StatCPUMeasurement.py | 9 +- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 22 ++- lnst/Slave/Job.py | 2 +- lnst/Tests/BaseTestModule.py | 12 ++ 19 files changed, 348 insertions(+), 62 deletions(-) -- 2.21.0

3 22

m打造星级秘书30
by 符铁屏 10 Jun '19

10 Jun '19

1 0

l金牌销售19
by 陈丽丽 09 Jun '19

09 Jun '19

1 0

[PATCH-next 1/3] lnst.Common.ExecCmd: decode std{out, err} immediately
by olichtne＠redhat.com 05 Jun '19

05 Jun '19

From: Ondrej Lichtner <olichtne(a)redhat.com> Instead of returning bytes, just decode the data immediately so that it can be worked with as before - strings. Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com> --- lnst/Common/ExecCmd.py | 6 ++++-- lnst/Common/GitVersion.py | 2 +- lnst/Common/Version.py | 2 +- lnst/Devices/Device.py | 7 +++---- lnst/Slave/InterfaceManager.py | 1 - 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lnst/Common/ExecCmd.py b/lnst/Common/ExecCmd.py index dff5b16..007acbd 100644 --- a/lnst/Common/ExecCmd.py +++ b/lnst/Common/ExecCmd.py @@ -58,6 +58,8 @@ def exec_cmd(cmd, die_on_err=True, log_outputs=True, report_stderr=False, json=F subp = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True) (data_stdout, data_stderr) = subp.communicate() + data_stdout = data_stdout.decode() + data_stderr = data_stderr.decode() ''' When we should not die on error, do not print anything and let @@ -65,9 +67,9 @@ def exec_cmd(cmd, die_on_err=True, log_outputs=True, report_stderr=False, json=F ''' if log_outputs: if data_stdout: - log_output(logging.debug, "Stdout", data_stdout.decode()) + log_output(logging.debug, "Stdout", data_stdout) if data_stderr: - log_output(logging.debug, "Stderr", data_stderr.decode()) + log_output(logging.debug, "Stderr", data_stderr) if subp.returncode and die_on_err: err = ExecCmdFail(cmd, subp.returncode, [data_stdout, data_stderr], report_stderr) logging.error(err) diff --git a/lnst/Common/GitVersion.py b/lnst/Common/GitVersion.py index fe088a2..6de3c1e 100644 --- a/lnst/Common/GitVersion.py +++ b/lnst/Common/GitVersion.py @@ -30,6 +30,6 @@ def git_version(): cmd = ['git', 'rev-parse', 'HEAD'] try: proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=null) - return proc.communicate()[0].strip() + return proc.communicate()[0].decode().strip() finally: os.chdir(cwd) diff --git a/lnst/Common/Version.py b/lnst/Common/Version.py index b6a2bc6..c7bacfd 100644 --- a/lnst/Common/Version.py +++ b/lnst/Common/Version.py @@ -21,7 +21,7 @@ def __init__(self): self._version = "14" if git_version: - self._version += "-" + git_version().decode() + self._version += "-" + git_version() @property def version(self): diff --git a/lnst/Devices/Device.py b/lnst/Devices/Device.py index 66ed7fc..30deb25 100644 --- a/lnst/Devices/Device.py +++ b/lnst/Devices/Device.py @@ -232,18 +232,18 @@ def _vars(self): def _clear_tc_qdisc(self): exec_cmd("tc qdisc del dev %s root" % self.name, die_on_err=False) out, _ = exec_cmd("tc filter show dev %s" % self.name) - ingress_handles = re.findall("ingress (\\d+):", out.decode()) + ingress_handles = re.findall("ingress (\\d+):", out) for ingress_handle in ingress_handles: exec_cmd("tc qdisc del dev %s handle %s: ingress" % (self.name, ingress_handle)) out, _ = exec_cmd("tc qdisc show dev %s" % self.name) - ingress_qdiscs = re.findall("qdisc ingress (\\w+):", out.decode()) + ingress_qdiscs = re.findall("qdisc ingress (\\w+):", out) if len(ingress_qdiscs) != 0: exec_cmd("tc qdisc del dev %s ingress" % self.name) def _clear_tc_filters(self): out, _ = exec_cmd("tc filter show dev %s" % self.name) - egress_prefs = re.findall("pref (\\d+) .* handle", out.decode()) + egress_prefs = re.findall("pref (\\d+) .* handle", out) for egress_pref in egress_prefs: exec_cmd("tc filter del dev %s pref %s" % (self.name, egress_pref)) @@ -631,7 +631,6 @@ def autoneg_off(self): def _read_adaptive_coalescing(self): try: res = exec_cmd("ethtool -c %s" % self.name) - res = res.decode() except: logging.debug("Could not read coalescence values of %s." % self.name) return (None, None) diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py index 7411a73..62f9222 100644 --- a/lnst/Slave/InterfaceManager.py +++ b/lnst/Slave/InterfaceManager.py @@ -261,7 +261,6 @@ def _is_name_used(self, name): out, _ = exec_cmd("ovs-vsctl --columns=name list Interface", log_outputs=False, die_on_err=False) - out = out.decode() for line in out.split("\n"): m = re.match(r'.*: \"(.*)\"', line) if m is not None: -- 2.21.0

3 4

[PATCH-next 0/1] Differentiate between physical, soft and virtual devices
by csfakian＠redhat.com 04 Jun '19

04 Jun '19

From: Christos Sfakianakis <csfakian(a)redhat.com> Hi, this patch allows the tester to check the remote type of of a device used in a test. In particular, it checks if a device is a generic device, a software device or a virtual device. A use case follows. ============================================================== Controller ============================================================== from lnst.Devices import VlanDevice from lnst.Devices.Device import Device as Dev from lnst.Devices.VlanDevice import VlanDevice as VlanDev from lnst.Devices.BridgeDevice import BridgeDevice as BridgeDev from lnst.Devices.SoftDevice import SoftDevice as SoftDev from lnst.Devices.VirtualDevice import VirtualDevice as VirtDev ... host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver")) host1.vlan0 = VlanDevice(realdev=host1.eth0, vlan_id=10) x = host1.vlan0 # Class hierarchy: Device >> SoftDevice >> VlanDevice # Device >> SoftDevice >> MasterDevice >> BridgeDevice # Before | After ------------------- isinstance(x, Dev) # True | True isinstance(x, SoftDev) # False | True isinstance(x, VlanDev) # False | True isinstance(x, BridgeDev) # False | False isinstance(host1.eth0, VirtDev) # True | True isinstance(x, VirtDev) # False | False | ======================================================|======= Slave | ======================================================|======= isinstance(dev, Dev) # True | True isinstance(dev, SoftDev) # True | True isinstance(dev, VlanDev) # True | True isinstance(dev, BridgeDev) # False | False The result on the slave hasn't changed. The result on the controller is now in agreement with that on the slave. Christos Christos Sfakianakis (1): lnst.Devices.Device: customize instance checks lnst/Devices/Device.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.17.1

3 3

as新劳動法15
by 征磊 03 Jun '19

03 Jun '19

1 0

产品研发10
by 陈雯 02 Jun '19

02 Jun '19

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

LNST-developers June 2019