# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch EtherTypeChange
# Your branch is up-to-date with 'opencord/master'.
#
# Changes to be committed:
# modified: voltha/adapters/tibit_olt/tibit_olt.py
# modified: voltha/extensions/eoam/EOAM.py
#
# Changes not staged for commit:
# modified: netconf/protos/schema.proto
# modified: netconf/protos/yang_options.proto
#
# Untracked files:
# .gitreview
# jq
# voltha/adapters/tibit_olt/tibit_olt.backup
# voltha/extensions/eoam/EOAM.paul
#
Modified the Ethertype from 0x9001 to 0xA8C8 in the following files:
voltha/extensions/eoam/EOAM.py
voltha/adapters/tibit_olt/tibit_olt.py
Change-Id: I05285180c379e7c3784711626476b289fba3b1c8
diff --git a/voltha/adapters/tibit_olt/tibit_olt.py b/voltha/adapters/tibit_olt/tibit_olt.py
index 391f62b..415ce7f 100644
--- a/voltha/adapters/tibit_olt/tibit_olt.py
+++ b/voltha/adapters/tibit_olt/tibit_olt.py
@@ -100,7 +100,7 @@
name = "TBJSON"
fields_desc = [StrField("data", default="")]
-bind_layers(Ether, TBJSON, type=0x9001)
+bind_layers(Ether, TBJSON, type=0xA8C8)
SUMITOMO_ELECTRIC_INDUSTRIES_OUI=u"0025DC"
diff --git a/voltha/extensions/eoam/EOAM.py b/voltha/extensions/eoam/EOAM.py
index fe6e214..9e6b709 100644
--- a/voltha/extensions/eoam/EOAM.py
+++ b/voltha/extensions/eoam/EOAM.py
@@ -89,7 +89,7 @@
PACKET /= frame_body
PACKET /= EndOfPDU()
else:
- PACKET.lastlayer().type = 0x9001
+ PACKET.lastlayer().type = 0xA8C8
PACKET /= frame_body
if (self.verbose == True):
@@ -135,7 +135,7 @@
BitField("length", 0x00, 9)
]
-bind_layers(Ether, EOAMPayload, type=0x9001)
+bind_layers(Ether, EOAMPayload, type=0xA8C8)
def mcastIp2McastMac(ip):
""" Convert a dot-notated IPv4 multicast address string into an multicast MAC address"""
@@ -148,7 +148,7 @@
name = "TBJSON"
fields_desc = [StrField("data", default="")]
-bind_layers(Ether, TBJSON, type=0x9001)
+bind_layers(Ether, TBJSON, type=0xA8C8)
if __name__ == "__main__":