summaryrefslogtreecommitdiff
path: root/maximus/python/lib
diff options
context:
space:
mode:
authorronciere2007-10-30 12:41:04 +0000
committerronciere2007-10-30 12:41:04 +0000
commit22fbbb6f3e1a0f845df1519c637936c97df8afab (patch)
tree66550198e33c06ed9e1e16afed1ae5007f9f6fab /maximus/python/lib
parent71dd09366710f6b4aa3e606ac26dfd90aff12457 (diff)
First script add
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@905 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'maximus/python/lib')
-rw-r--r--maximus/python/lib/mmentryFields.py10
-rw-r--r--maximus/python/lib/mmentryMethod.py6
2 files changed, 8 insertions, 8 deletions
diff --git a/maximus/python/lib/mmentryFields.py b/maximus/python/lib/mmentryFields.py
index e112e5fbca..51eec9df1e 100644
--- a/maximus/python/lib/mmentryFields.py
+++ b/maximus/python/lib/mmentryFields.py
@@ -1,4 +1,4 @@
-# -*- coding:Utf-8 -*-
+
#MMENTRY Fields
from struct import *
@@ -607,14 +607,14 @@ class GlidsInfo():
while i<numGlid:
glidsInfo.append(glids.glidsField[i] + cfDetectedsField[i] + csmaDetectedsField[i] + hp1DetectedsField[i] + othersDetectedsField[i] + signalLevelsField[i] + averageBle.intervalField[i])
i=i+1
- def createGlidsInfo(self, myNumGlid=None, myCfDetecteds=None, myCsmaDetecteds=None, myHp1Detecteds=None, myOthersDetecteds=None, mySignalLevels=None, myNum=myNumGlid, myEndTime=None, myIntBle=None):
+ def createGlidsInfo(self, myNumGlid=None, myCfDetecteds=None, myCsmaDetecteds=None, myHp1Detecteds=None, myOthersDetecteds=None, mySignalLevels=None, myEndTime=None, myIntBle=None):
self.createGlids(myNumGlid)
self.createCfDetecteds(myCfDetecteds)
self.createCsmaDetecteds(myCsmaDetecteds)
self.createHp1Detecteds(myHp1Detecteds)
self.createOthersDetecteds(myOthersDetecteds)
self.createSignalLevels(mySignalLevels)
- self.createAverageBles(myNum, myEndTime, myIntBle)
+ self.createAverageBles(myNumGlid, myEndTime, myIntBle)
self.i=0
while self.i<self.numGlid:
self.glidsInfo[self.i] = self.glids.glidsField[self.i] + self.cfDetectedsField[self.i] + self.csmaDetectedsField[self.i] + self.hp1DetectedsField[self.i] + self.othersDetectedsField[self.i] + self.signalLevelsField[self.i] + self.averageBle.intervalField[self.i]
@@ -894,10 +894,10 @@ class MmentryFields():
glidsInfo = GlidsInfo()
glidsInfo.numGlid = numGlid
glidsInfo.createGlidsInfo()
- def createGlidsInfo(self, myNumGlid=None, myCfDetecteds=None, myCsmaDetecteds=None, myHp1Detecteds=None, myOthersDetecteds=None, mySignalLevels=None, myNum=myNumGlid, myEndTime=None, myIntBle=None):
+ def createGlidsInfo(self, myNumGlid=None, myCfDetecteds=None, myCsmaDetecteds=None, myHp1Detecteds=None, myOthersDetecteds=None, mySignalLevels=None, myEndTime=None, myIntBle=None):
self.createNumGlid(myNumGlid)
self.glidsInfo.numGlid = self.numGlid
- self.glidsInfo.createGlidsInfo(myCfDetecteds, myCsmaDetecteds, myHp1Detecteds, myOthersDetecteds, mySignalLevels, myNum=myNumGlid, myEndTime, myIntBle)
+ self.glidsInfo.createGlidsInfo(myCfDetecteds, myCsmaDetecteds, myHp1Detecteds, myOthersDetecteds, mySignalLevels, myNumGlid, myEndTime, myIntBle)
#Network Identifier
reserved = 0
diff --git a/maximus/python/lib/mmentryMethod.py b/maximus/python/lib/mmentryMethod.py
index 9599f95b74..dbd40b5f32 100644
--- a/maximus/python/lib/mmentryMethod.py
+++ b/maximus/python/lib/mmentryMethod.py
@@ -135,19 +135,19 @@ class MmentryMethod():
#createCC_DISCOVER_LIST_CNF_MMENTRY creates
# the MMENTRY Field of the CC_DISCOVER_LIST.CNF MME
- def createCC_DISCOVER_LIST_CNF_MMENTRY(self, myNumSta=0, myMacAddress=None, myTei=None, mySameNetwork=None, mySnid=None, myAccess=None, mySnidAccess=None, myCcoCapability=None, myProxyNetworkCapability=None, myBackupCcoCapability=None, myCcoStatus=None, myPcoStatus=None, myBackupCcoStatus=None, myNinthOctet=None, mySignalLevel=None, myEndTime=None, myIntBle=None, myNumNet=0, mySecurityLevel=None, myNidOffset=None, myNid=None, mySnid=None, myAccess=None, mySnidAccess=None, myHm=None, myNumSlot=None, myCoordonatingStatus=None, myOffset=None):
+ def createCC_DISCOVER_LIST_CNF_MMENTRY(self, myNumSta=0, myMacAddress=None, myTei=None, mySameNetwork=None, mySnidStation=None, myAccessStation=None, mySnidAccessStation=None, myCcoCapability=None, myProxyNetworkCapability=None, myBackupCcoCapability=None, myCcoStatus=None, myPcoStatus=None, myBackupCcoStatus=None, myNinthOctet=None, mySignalLevel=None, myEndTime=None, myIntBle=None, myNumNet=0, mySecurityLevel=None, myNidOffset=None, myNid=None, mySnidNetwork=None, myAccessNetwork=None, mySnidAccessNetwork=None, myHm=None, myNumSlot=None, myCoordonatingStatus=None, myOffset=None):
#CC_DISCOVER_LIST_CNF_MMENTRY is composed by 4 field :
# - NumStation
# - StationInfo -*NumStation-
# - NumNetwork
# - NetworkInfo -*NumNetwork-
- self.mmentryFields.createStationsInfo(myNumSta, myMacAddress, myTei, mySameNetwork, mySnid, myAccess, mySnidAccess, myCcoCapability, myProxyNetworkCapability, myBackupCcoCapability, myCcoStatus, myPcoStatus, myBackupCcoStatus, myNinthOctet, mySignalLevel, myEndTime, myIntBle)
+ self.mmentryFields.createStationsInfo(myNumSta, myMacAddress, myTei, mySameNetwork, mySnidStation, myAccessStation, mySnidAccessStation, myCcoCapability, myProxyNetworkCapability, myBackupCcoCapability, myCcoStatus, myPcoStatus, myBackupCcoStatus, myNinthOctet, mySignalLevel, myEndTime, myIntBle)
self.mmentry.CC_DISCOVER_LIST_CNF = self.mmentryFields.numStaField
i=0
while i<self.mmentryFields.numSta:
self.mmentry.CC_DISCOVER_LIST_CNF = self.mmentry.CC_DISCOVER_LIST_CNF + self.mmentryFields.stationsInfo[i].stationInfo
i=i+1
- self.mmentryFields.createNetworksInfo(myNumNet, mySecurityLevel, myNidOffset, myNid, mySnid, myAccess, mySnidAccess, myHm, myNumSlot, myCoordonatingStatus, myOffset)
+ self.mmentryFields.createNetworksInfo(myNumNet, mySecurityLevel, myNidOffset, myNid, mySnidNetwork, myAccessNetwork, mySnidAccessNetwork, myHm, myNumSlot, myCoordonatingStatus, myOffset)
self.mmentry.CC_DISCOVER_LIST_CNF = self.mmentry.CC_DISCOVER_LIST_CNF + self.mmentryFields.numNetField
i=0
while i<self.mmentryFields.numNet: