From: Hanoh Haim <hhaim@cisco.com>
Date: Sun, 28 Feb 2016 11:31:31 +0000 (+0200)
Subject: merge max_port=12 support
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b83eb43c25f0452c152d31966da4b1af5c304a6b;p=trex.git

merge max_port=12 support
---

b83eb43c25f0452c152d31966da4b1af5c304a6b
diff --cc scripts/dpdk_setup_ports.py
index 5cd42a8f,57670f47..9472c0b3
--- a/scripts/dpdk_setup_ports.py
+++ b/scripts/dpdk_setup_ports.py
@@@ -76,23 -76,24 +76,26 @@@ Other network device
            raise e
  
          stream.close();
+         cfg_dict = self.m_cfg_dict[0]
+         if not cfg_dict.has_key('version') :
+             self.raise_error ("Configuration file %s is old, should include version field\n" % fcfg )
  
-         if not self.m_cfg_dict[0].has_key('version') :
-             self.raise_error ("Configuration file %s is old, should include version field" % fcfg )
- 
-         if int(self.m_cfg_dict[0]['version'])<2 :
-             self.raise_error ("Configuration file %s is old, should include version field with value greater than 2" % fcfg)
+         if int(cfg_dict['version'])<2 :
+             self.raise_error ("Configuration file %s is old, should include version field with value greater than 2\n" % fcfg)
  
 -
 -        if not cfg_dict.has_key('interfaces') :
 -            self.raise_error ("Configuration file %s is old, should include interfaces field with 2,4,6,8,10,12 number of elemets\n" % fcfg)
 -
 -        if_list=cfg_dict['interfaces']
 -        if not (len(if_list) in [2,4,6,8,10,12]):
 -            self.raise_error ("Configuration file %s should include interfaces field with 2,4,6,8,10,12 number of elemets\n" % fcfg)
 -
 +        if not self.m_cfg_dict[0].has_key('interfaces') :
 +            self.raise_error ("Configuration file %s is old, should include interfaces field even number of elemets" % fcfg)
 +
 +        if_list=self.m_cfg_dict[0]['interfaces']
 +        l=len(if_list);
 +        if (l>20):
 +            self.raise_error ("Configuration file %s should include interfaces field with maximum of number of elemets" % (fcfg,l))
 +        if ((l % 2)==1):
 +            self.raise_error ("Configuration file %s should include even number of interfaces " % (fcfg,l))
+         if 'port_limit' in cfg_dict and cfg_dict['port_limit'] > len(if_list):
+             self.raise_error ('Error: port_limit should not be higher than number of interfaces in config file: %s\n' % fcfg)
+ 
 +
      def do_bind_one (self,key):
          cmd='./dpdk_nic_bind.py --force --bind=igb_uio %s ' % ( key)
          print cmd