Removed necessity for hard-coding IPs of host

Fix for the TypeError
TypeError: 'module' object is not callable error happening because of call to pcap_to_ditg.
Removed necessity for hard-coding IPs of host
Clear a debug message

README.rst

@@ -85,9 +85,9 @@ Usage
 
    ::
 
-       Host,Start_row,End_row,Number
-       h1,1734,1902,169
-       h2,1528,1733,206
+       Host,Start_row,End_row,Number,IP
+       h1,1734,1902,169,10.0.0.1
+       h2,1528,1733,206,10.0.0.2
        .
        .
        .

examples/run.py

@@ -49,7 +49,7 @@ def getArgParser():
         'orig_ports': args.orig_ports,
     }
 
-    pToD = pcap_to_ditg(
+    pToD = pcap_to_ditg.pcap_to_ditg(
         args.pcap_file, # Pcap file to read
         args.mapper_file, # File with mapping of IPs to topology hosts
         args.list_file, # File with list of IPs

pcap_to_ditg/pcap_to_ditg.py

@@ -41,8 +41,8 @@ def __init__(self,
             'end_time' : 30,
             'ps_opts': '',
             'orig_ports': False,
-        }
-    ):
+            }
+        ):
         super(pcap_to_ditg, self).__init__()
         self.pcap_file = pcap_file
         self.mapper_file = mapper_file
@@ -113,21 +113,6 @@ def __addToFlows(self, key, timestamp, size, rp, L4type='TCP'):
         l[3] = rp
         self.__Flows[key] = l
 
-    @classmethod
-    def __getIpForHost(self, host):
-        if host == 'h1':
-            return '10.0.1.10'
-        elif host == 'h2':
-            return '10.0.1.20'
-        elif host == 'h3':
-            return '10.0.2.10'
-        elif host == 'h4':
-            return '10.0.2.20'
-        elif host == 'h5':
-            return '10.0.10.1'
-        elif host == 'h6':
-            return '10.0.5.2'
-
     def __writeFlowToFile(self, key):
         origSIP = self.__getSrcIPAddrFromKey(key)
         origDIP = self.__getDstIPAddrFromKey(key)
@@ -198,6 +183,7 @@ def __readPartitions(self):
                         endPoints = []
                         endPoints.append(line.split(',')[1]) # start
                         endPoints.append(line.split(',')[2]) # end
+                        endPoints.append(line.split(',')[4][:-1]) # ip
                         Partitions[host] = endPoints
             return Partitions
         except Exception, e:
@@ -213,7 +199,7 @@ def __generateMapper(self):
             if os.path.exists(self.list_file):
                 for i in range(int(endPoints[0]), int(endPoints[1]) + 1):
                     ip = linecache.getline(self.list_file, i).strip().strip(',')
-                    (self.__IpMapDict)[ip] = pcap_to_ditg.__getIpForHost(p)
+                    (self.__IpMapDict)[ip] = endPoints[2]
             else:
                 print('*** The file \'' + self.list_file + '\' could not be read\n')
                 raise IOError('The file \'' + self.list_file + '\' could not be read\n')