commit 99a3ed9d5f1595a8ab668f0d9768d961d79c95d5
author Admin <admin@cordsrv> Wed Mar 02 17:22:50 2016 -0800
committer Admin <admin@cordsrv> Wed Mar 02 17:22:50 2016 -0800
tree 67733b1e92a32e8b3a947187014d7c5152aa7616
parent 0fc1bd4092a8ae51664a0fcb48acb4ee2a67b46d

aligning multicast addresses

olt.py

diff --git a/olt.py b/olt.py
index 8134cb9..13c997a 100644
--- a/olt.py
+++ b/olt.py
@@ -58,10 +58,14 @@
         match.oxm_list.append(ofp.oxm.ip_proto(2))
 
         igmp = IGMPv3(type=IGMP_TYPE_V3_MEMBERSHIP_REPORT, max_resp_code=30, gaddr="224.0.0.1")
-        igmp.grps = [IGMPv3gr(rtype=IGMP_V3_GR_TYPE_EXCLUDE, mcaddr="229.10.20.30")]
-        pkt = IGMPv3.fixup( scapy.Ether(src='00:00:00:00:be:ef', dst='01:00:5E:00:00:01') \
-                            / scapy.IP(src='192.168.0.123', dst='229.10.20.30') / igmp )
-        pkt = pkt / ("0" * (100 - len(pkt)))
+        igmp.grps = [IGMPv3gr(rtype=IGMP_V3_GR_TYPE_INCLUDE, mcaddr="229.10.20.30")]
+        pkt = IGMPv3.fixup( scapy.Ether(src='00:00:00:00:be:ef', dst='01:00:5e:00:00:01') \
+                            / scapy.IP(src='192.168.0.123', dst='224.0.0.22') / igmp )
+        if len(pkt) < 60:
+                pad_len = 60 - len(pkt)
+                pad = scapy.PAD()
+                pad.load = '\x00' * pad_len
+                pkt = pkt/pad
 
         self.testPacketIn(match, pkt)
 
@@ -706,7 +710,7 @@
         time.sleep(5)
 
         pkt = simple_udp_packet(dl_vlan_enable=True, vlan_vid=vlan_id, vlan_pcp=0, \
-                                eth_dst = "01:00:5E:00:00:01", ip_dst = "229.10.20.30")
+                                eth_dst = "01:00:5e:0a:14:1e", ip_dst = "229.10.20.30")
 
         # downstream
         self.dataplane.send(olt_port, str(pkt))