Revision dfb0ec90

b/iooclient/eos_ned.py
28 28
        @param server: The Hostname or IPv4 address of the Alcatel NMS.
29 29
        
30 30
        @type port: Integer
31
        @param port: The TCP port on the Alcatel NMS we will connect to.
31
        @param port: The TCP port on the Alcatel NMS we will connect to. Default 20006
32 32
        
33 33
        @type password: String
34 34
        @param password: The password for this connection.
b/iooclient/eos_pmd.py
30 30
        @param server: The Hostname or IPv4 address of the Alcatel NMS.
31 31
        
32 32
        @type port: Integer
33
        @param port: The TCP port on the Alcatel NMS we will connect to.
33
        @param port: The TCP port on the Alcatel NMS we will connect to. Default 20007
34 34
        
35 35
        @type password: String
36 36
        @param password: The password for this connection.
......
42 42
            port = 20007
43 43
        return eos.__init__(self, server, port, password)
44 44
    
45
    def list_pm_data(self, startPeriod=None, endPeriod=None, neName=[], periodType=None, counters=[], pmPoints=[], parse=True):
45
    def list_pm_data(self, startPeriod=None, endPeriod=None, neNames=[], periodType=None, counters=[], pmPoints=[], parse=True):
46 46
        '''
47 47
        Function used to obtain a listing of of PM DATA from NMS. Depending on parse value the output is either raw data from NMS 
48 48
        or structured python data
......
73 73
        @type endPeriod: String
74 74
        @param endPeriod: To when to collect PM data. Format: YYYYMMDDQH where QH in [00,96] representing 15min periods in a day.
75 75
        
76
        @type neName: A list of strings
77
        @param neName: A list of NetworkElement names with pmPoints assigned. If omitted all NEs are assumed
76
        @type neNames: A list of strings
77
        @param neNames: A list of NetworkElement names with pmPoints assigned. If omitted all NEs are assumed. To get different pmpoints from different network elements use the notation ['neName1{pmpoint1|pmpoint2}','neName2{pmpoint4|pmpoint5}','neName3']
78 78
                
79 79
        @type periodType: String
80 80
        @param periodType: The period of monitoring. Values: 15, 1h, 24, RM1, RM2, RM3, RM4, RM5, FL, immediate, peak, 30-day, IM, day, month. Default 15
81 81
        
82 82
        @type counters: A list of strings
83
        @param counters: The counters for the above NetworkElements to fetch. If omitted all counters
83
        @param counters: The counters for the above NetworkElements to fetch. Assumes that the Network Elements have the same pmPoints. If omitted all counters are returned
84 84
        
85 85
        @type pmPoints: A list of strings
86
        @param pmPoints: The counters for the above NetworkElements to fetch. If omitted all counters
86
        @param pmPoints: The pmPoints for the above NetworkElements to fetch. Assumes that the Network Elements have the same pmPoints. If omitted all pmPoints are fetched.
87 87
        
88 88
        @type parse: Boolean
89 89
        @param parse: Default: True. If set to True, the output is a python list of dictionaries. Otherwise the output is the NMS response text.   
......
92 92
        @return: Performance monitoring data (counter values) in raw text format or in structured format. False in case of errors.
93 93
        '''
94 94
        extras = []
95
        extras.append('periodType=%s'%(periodType) if periodType else '')
95
        extras.append('periodType=%s'%(periodType) if periodType else 'periodType=15')
96 96
        extras.append('startPeriod=%s'%(startPeriod) if startPeriod else '')
97 97
        extras.append('endPeriod=%s'%(endPeriod) if endPeriod else '')
98 98
        extras.append('counters={%s}'%(('|'.join(counters)) if counters else ''))
99 99
        pmpoints = '{%s}' %('|'.join(["pmPoint="+pmPoint for pmPoint in pmPoints])) if pmPoints else None
100
        extras.append('neName=%s'%(''.join([name+(pmpoints or '{}') for name in neName])) if neName else '')
100
        extras.append('neName=%s'%(''.join([name+(pmpoints or '{}') for name in neNames])) if neNames else '')
101 101
        params = "|".join(extras) or ''
102 102
        message = "LIST_PM_DATA_REQ[%s]" %params
103 103
        if self.send(message) == False:
......
160 160
        @return: Performance monitoring points (counter names) in raw text or in structured format. False in case of errors.
161 161
        '''
162 162
        extras = []
163
        extras.append('%s'%(periodType) if periodType else '')
163
        extras.append('%s'%(periodType) if periodType else '15')
164 164
        extras.append('%s'%(period) if period else '')
165 165
        extras.append('{%s}'%(('|'.join(neNames)) if neNames else ''))
166 166
        params = "|".join(extras) or ''

Also available in: Unified diff