diff --git a/pyogp/lib/base/message/__init__.py b/pyogp/lib/base/message/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pyogp/lib/base/message/__init__.pyc b/pyogp/lib/base/message/__init__.pyc new file mode 100644 index 0000000..e31b22d Binary files /dev/null and b/pyogp/lib/base/message/__init__.pyc differ diff --git a/pyogp/lib/base/data_packer.py b/pyogp/lib/base/message/data_packer.py similarity index 97% rename from pyogp/lib/base/data_packer.py rename to pyogp/lib/base/message/data_packer.py index eb59bd7..1bfb627 100644 --- a/pyogp/lib/base/data_packer.py +++ b/pyogp/lib/base/message/data_packer.py @@ -1,6 +1,6 @@ import struct -from pyogp.lib.base.message_types import MsgType +from pyogp.lib.base.message.message_types import MsgType class DataPacker(object): def __init__(self): diff --git a/pyogp/lib/base/message/data_packer.pyc b/pyogp/lib/base/message/data_packer.pyc new file mode 100644 index 0000000..3183e0d Binary files /dev/null and b/pyogp/lib/base/message/data_packer.pyc differ diff --git a/pyogp/lib/base/message_template.py b/pyogp/lib/base/message/message_template.py similarity index 97% rename from pyogp/lib/base/message_template.py rename to pyogp/lib/base/message/message_template.py index ba52f2c..72e1488 100644 --- a/pyogp/lib/base/message_template.py +++ b/pyogp/lib/base/message/message_template.py @@ -29,10 +29,6 @@ import re import pprint #local libraries -from makepacketdict import makepacketdict, makereversepacketdict - -mypacketdictionary = makepacketdict() -myreversedictionary = makereversepacketdict() """ can construct and deconstruct packet headers. Has nothing to do with the packet payload, yet. """ @@ -149,7 +145,7 @@ class MessageTemplate(object): return self.block_map[name] #these remain unformatted (by standard) because they are going to be moved -def decodeHeaderPair(frequency, num): +"""def decodeHeaderPair(frequency, num): return mypacketdictionary[(frequency, num)] def decodeFrequency(header): @@ -223,4 +219,4 @@ def encodeHeaderName(ack, sequenceNumber, packetName): def encodeHeader(ack, sequenceNumber, frequency, num): packetID = encodePacketID(frequency, num) - return ack + struct.pack('>LB', sequenceNumber, 0) + packetID + return ack + struct.pack('>LB', sequenceNumber, 0) + packetID""" diff --git a/pyogp/lib/base/message/message_template.pyc b/pyogp/lib/base/message/message_template.pyc new file mode 100644 index 0000000..6e3af95 Binary files /dev/null and b/pyogp/lib/base/message/message_template.pyc differ diff --git a/pyogp/lib/base/message_template_builder.py b/pyogp/lib/base/message/message_template_builder.py similarity index 97% rename from pyogp/lib/base/message_template_builder.py rename to pyogp/lib/base/message/message_template_builder.py index 1cdbb60..6488429 100644 --- a/pyogp/lib/base/message_template_builder.py +++ b/pyogp/lib/base/message/message_template_builder.py @@ -2,11 +2,11 @@ import struct #pyogp libs -from pyogp.lib.base.message_template import MsgData, MsgBlockData, \ +from pyogp.lib.base.message.message_template import MsgData, MsgBlockData, \ MsgVariableData #import pyogp.lib.base.message_types -from pyogp.lib.base.message_types import MsgType, MsgBlockType, MsgFrequency, sizeof -from pyogp.lib.base.data_packer import DataPacker +from pyogp.lib.base.message.message_types import MsgType, MsgBlockType, MsgFrequency, sizeof +from pyogp.lib.base.message.data_packer import DataPacker class MessageTemplateBuilder(object): """ This class builds messages at its high level, that is, keeping diff --git a/pyogp/lib/base/message/message_template_builder.pyc b/pyogp/lib/base/message/message_template_builder.pyc new file mode 100644 index 0000000..8106381 Binary files /dev/null and b/pyogp/lib/base/message/message_template_builder.pyc differ diff --git a/pyogp/lib/base/message_template_dict.py b/pyogp/lib/base/message/message_template_dict.py similarity index 96% rename from pyogp/lib/base/message_template_dict.py rename to pyogp/lib/base/message/message_template_dict.py index 6987978..8796062 100644 --- a/pyogp/lib/base/message_template_dict.py +++ b/pyogp/lib/base/message/message_template_dict.py @@ -1,5 +1,5 @@ from pyogp.lib.base.data import msg_tmpl -from pyogp.lib.base.message_types import MsgFrequency +from pyogp.lib.base.message.message_types import MsgFrequency class TemplateDictionary(object): def __init__(self, template_list): diff --git a/pyogp/lib/base/message/message_template_dict.pyc b/pyogp/lib/base/message/message_template_dict.pyc new file mode 100644 index 0000000..674c14e Binary files /dev/null and b/pyogp/lib/base/message/message_template_dict.pyc differ diff --git a/pyogp/lib/base/message_template_parser.py b/pyogp/lib/base/message/message_template_parser.py similarity index 99% rename from pyogp/lib/base/message_template_parser.py rename to pyogp/lib/base/message/message_template_parser.py index aa2b866..a5022de 100644 --- a/pyogp/lib/base/message_template_parser.py +++ b/pyogp/lib/base/message/message_template_parser.py @@ -7,7 +7,7 @@ import pprint #local libraries import message_template from pyogp.lib.base.data import msg_tmpl -from pyogp.lib.base.message_types import MsgFrequency, MsgTrust, \ +from pyogp.lib.base.message.message_types import MsgFrequency, MsgTrust, \ MsgEncoding, MsgDeprecation, MsgBlockType, MsgType class MessageTemplateParser(object): diff --git a/pyogp/lib/base/message/message_template_parser.pyc b/pyogp/lib/base/message/message_template_parser.pyc new file mode 100644 index 0000000..ae253fd Binary files /dev/null and b/pyogp/lib/base/message/message_template_parser.pyc differ diff --git a/pyogp/lib/base/message_types.py b/pyogp/lib/base/message/message_types.py similarity index 100% rename from pyogp/lib/base/message_types.py rename to pyogp/lib/base/message/message_types.py diff --git a/pyogp/lib/base/message/message_types.pyc b/pyogp/lib/base/message/message_types.pyc new file mode 100644 index 0000000..7372d4e Binary files /dev/null and b/pyogp/lib/base/message/message_types.pyc differ diff --git a/pyogp/lib/base/packet_test.py b/pyogp/lib/base/tests/packet_test.py similarity index 99% rename from pyogp/lib/base/packet_test.py rename to pyogp/lib/base/tests/packet_test.py index dc884fe..d7b5d5a 100644 --- a/pyogp/lib/base/packet_test.py +++ b/pyogp/lib/base/tests/packet_test.py @@ -2,7 +2,7 @@ import unittest import message_template class PacketTest(unittest.TestCase): - +""" #testing each component def test_freqLow(self): assert message_template.decodeFrequency('\xFF\xFF\x01') == 'Low', '0xFFFF01 is supposed to be "Low"' @@ -101,6 +101,6 @@ class PacketTest(unittest.TestCase): def test_encodeHeaderNameHigh(self): header = message_template.encodeHeaderName(message_template.LL_NONE, 1, 'StartPingCheck') assert header == '\x00\x00\x00\x00\x01\x00\x01', 'Outcome: ' + repr(header) + ' Expected: ' + r'\x00\x00\x00\x00\x01\x00\x01' - +""" if __name__ == "__main__": unittest.main() diff --git a/pyogp/lib/base/tests/test_template_builder.py b/pyogp/lib/base/tests/test_template_builder.py index 18a50c9..32a8403 100644 --- a/pyogp/lib/base/tests/test_template_builder.py +++ b/pyogp/lib/base/tests/test_template_builder.py @@ -4,11 +4,11 @@ from uuid import UUID #local libraries from pyogp.lib.base.data import msg_tmpl -from pyogp.lib.base.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable -from pyogp.lib.base.message_template_parser import MessageTemplateParser -from pyogp.lib.base.message_template_builder import MessageTemplateBuilder -from pyogp.lib.base.message_template_dict import TemplateDictionary -from pyogp.lib.base.message_types import MsgType +from pyogp.lib.base.message.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable +from pyogp.lib.base.message.message_template_parser import MessageTemplateParser +from pyogp.lib.base.message.message_template_builder import MessageTemplateBuilder +from pyogp.lib.base.message.message_template_dict import TemplateDictionary +from pyogp.lib.base.message.message_types import MsgType #from indra.base.lluuid import UUID class TestTemplateBuilder(unittest.TestCase): diff --git a/pyogp/lib/base/tests/test_template_parser.py b/pyogp/lib/base/tests/test_template_parser.py index 708f98b..9aa73c3 100644 --- a/pyogp/lib/base/tests/test_template_parser.py +++ b/pyogp/lib/base/tests/test_template_parser.py @@ -3,10 +3,10 @@ import unittest, doctest #local libraries from pyogp.lib.base.data import msg_tmpl -from pyogp.lib.base.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable -from pyogp.lib.base.message_template_dict import TemplateDictionary -from pyogp.lib.base.message_template_parser import MessageTemplateParser -from pyogp.lib.base.message_types import MsgFrequency, MsgTrust, \ +from pyogp.lib.base.message.message_template import MessageTemplate, MessageTemplateBlock, MessageTemplateVariable +from pyogp.lib.base.message.message_template_dict import TemplateDictionary +from pyogp.lib.base.message.message_template_parser import MessageTemplateParser +from pyogp.lib.base.message.message_types import MsgFrequency, MsgTrust, \ MsgEncoding, MsgDeprecation, MsgBlockType, MsgType class TestDictionary(unittest.TestCase):