홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Saurav Das
428ebc9c 1 parent e528c118

Removing some old dependencies in bgprouter. 

Fixing the ICMP handlers in a couple of apps.
Adding some sample configs.

Change-Id: Id33e0effd9452558fc4d07d78b093f0818e96d23
Inline Side-by-side
Showing 5 changed files with 96 additions and 37 deletions
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
24 <relativePath>../pom.xml</relativePath> 24 <relativePath>../pom.xml</relativePath>
25 </parent> 25 </parent>
26 <modelVersion>4.0.0</modelVersion> 26 <modelVersion>4.0.0</modelVersion>
27 -
28 <artifactId>onos-app-bgprouter</artifactId> 27 <artifactId>onos-app-bgprouter</artifactId>
29 28
30 <packaging>bundle</packaging> 29 <packaging>bundle</packaging>
......
...@@ -101,6 +101,7 @@ public class IcmpHandler { ...@@ -101,6 +101,7 @@ public class IcmpHandler {
101 icmpReplyIpv4.setChecksum((short) 0); 101 icmpReplyIpv4.setChecksum((short) 0);
102 102
103 ICMP icmpReply = new ICMP(); 103 ICMP icmpReply = new ICMP();
104 + icmpReply.setPayload(((ICMP) icmpRequestIpv4.getPayload()).getPayload());
104 icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY); 105 icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY);
105 icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY); 106 icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY);
106 icmpReply.setChecksum((short) 0); 107 icmpReply.setChecksum((short) 0);
......
...@@ -111,10 +111,10 @@ public class IcmpHandler { ...@@ -111,10 +111,10 @@ public class IcmpHandler {
111 icmpReplyIpv4.setChecksum((short) 0); 111 icmpReplyIpv4.setChecksum((short) 0);
112 112
113 ICMP icmpReply = new ICMP(); 113 ICMP icmpReply = new ICMP();
114 + icmpReply.setPayload(((ICMP) icmpRequestIpv4.getPayload()).getPayload());
114 icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY); 115 icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY);
115 icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY); 116 icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY);
116 icmpReply.setChecksum((short) 0); 117 icmpReply.setChecksum((short) 0);
117 -
118 icmpReplyIpv4.setPayload(icmpReply); 118 icmpReplyIpv4.setPayload(icmpReply);
119 119
120 icmpReplyEth.setPayload(icmpReplyIpv4); 120 icmpReplyEth.setPayload(icmpReplyIpv4);
......
1 +{
2 + "ports" : {
3 + "of:0000000000000002/1" : {
4 + "interfaces" : [
5 + {
6 + "ips" : [ "192.168.10.101/24" ],
7 + "mac" : "08:9e:01:82:38:68",
8 + "vlan" : "100"
9 + }
10 + ]
11 + },
12 + "of:0000000000000002/20" : {
13 + "interfaces" : [
14 + {
15 + "ips" : [ "192.168.20.101/24" ],
16 + "mac" : "08:9e:01:82:38:68",
17 + "vlan" : "200"
18 + }
19 + ]
20 + }
21 + },
22 + "apps" : {
23 + "org.onosproject.router" : {
24 + "bgp" : {
25 + "bgpSpeakers" : [
26 + {
27 + "connectPoint" : "of:00000000000000aa/10",
28 + "peers" : [
29 + "192.168.10.1"
30 + ]
31 + },
32 + {
33 + "connectPoint" : "of:00000000000000aa/20",
34 + "peers" : [
35 + "192.168.20.1"
36 + ]
37 + }
38 + ]
39 + }
40 + }
41 + }
42 +}
1 { 1 {
2 - "comment": " Multilayer topology description and configuration", 2 + "comment": "Configuration for a 4X4 leaf-spine fabric",
3 "restrictSwitches": true, 3 "restrictSwitches": true,
4 "restrictLinks": true, 4 "restrictLinks": true,
5 5
6 "switchConfig": 6 "switchConfig":
7 [ 7 [
8 - { "nodeDpid" : "of:0000000000000001", "name": "Dallas-R1", "type": "Router_SR", "allowed": true, 8 + { "nodeDpid" : "of:0000000000000001", "name": "Leaf-R1", "type": "Router_SR", "allowed": true,
9 "latitude": 80.80, "longitude": 90.10, 9 "latitude": 80.80, "longitude": 90.10,
10 - "params": { "routerIp": "192.168.0.1/32", 10 + "params": { "routerIp": "10.0.1.254/32",
11 - "routerMac": "00:00:01:01:01:80", 11 + "routerMac": "00:00:00:00:01:80",
12 "nodeSid": 101, 12 "nodeSid": 101,
13 "isEdgeRouter" : true, 13 "isEdgeRouter" : true,
14 - "adjacencySids": [
15 - { "ports": [ 4, 5 ], "adjSid": 10234 },
16 - { "ports": [ 6, 7 ], "adjSid": 29019 }
17 - ],
18 "subnets": [ 14 "subnets": [
19 - { "portNo": 1, "subnetIp": "10.0.1.128/24" } 15 + { "portNo": 1, "subnetIp": "10.0.1.254/24" }
20 ] 16 ]
21 } 17 }
22 }, 18 },
23 19
24 - { "nodeDpid": "of:0000000000000002", "name": "Dallas-R2", "type": "Router_SR", "allowed": true, 20 + { "nodeDpid": "of:0000000000000002", "name": "Leaf-R2", "type": "Router_SR", "allowed": true,
25 "latitude": 80.80, "longitude": 90.10, 21 "latitude": 80.80, "longitude": 90.10,
26 - "params": { "routerIp": "192.168.0.2/32", 22 + "params": { "routerIp": "10.0.2.254/32",
27 - "routerMac": "00:00:02:02:02:80", 23 + "routerMac": "00:00:00:00:02:80",
28 "nodeSid": 102, 24 "nodeSid": 102,
29 - "isEdgeRouter" : false, 25 + "isEdgeRouter" : true,
30 - "adjacencySids": [ 26 + "subnets": [
31 - { "ports": [ 1, 2 ], "adjSid": 12453 }, 27 + { "portNo": 1, "subnetIp": "10.0.2.254/24" }
32 - { "ports": [ 2, 3 ], "adjSid": 23333 },
33 - { "ports": [ 3, 1 ], "adjSid": 22233 }
34 ] 28 ]
35 } 29 }
30 +
36 }, 31 },
37 32
38 - { "nodeDpid": "of:0000000000000003", "name": "Dallas-R3", "type": "Router_SR", "allowed": true, 33 + { "nodeDpid": "of:0000000000000003", "name": "Leaf-R3", "type": "Router_SR", "allowed": true,
39 "latitude": 80.80, "longitude": 90.10, 34 "latitude": 80.80, "longitude": 90.10,
40 - "params": { "routerIp": "192.168.0.3/32", 35 + "params": { "routerIp": "10.0.3.101/32",
41 - "routerMac": "00:00:03:03:03:80", 36 + "routerMac": "00:00:00:00:03:80",
42 "nodeSid": 103, 37 "nodeSid": 103,
43 - "isEdgeRouter" : false 38 + "isEdgeRouter" : true,
39 + "subnets": [
40 + { "portNo": 1, "subnetIp": "10.0.3.254/24" }
41 + ]
44 } 42 }
43 +
45 }, 44 },
46 45
47 - { "nodeDpid": "of:0000000000000004", "name": "Dallas-R4", "type": "Router_SR", "allowed": true, 46 + { "nodeDpid": "of:0000000000000004", "name": "Leaf-R4", "type": "Router_SR", "allowed": true,
48 "latitude": 80.80, "longitude": 90.10, 47 "latitude": 80.80, "longitude": 90.10,
49 - "params": { "routerIp": "192.168.0.4/32", 48 + "params": { "routerIp": "10.0.4.101/32",
50 - "routerMac": "00:00:04:04:04:80", 49 + "routerMac": "00:00:00:00:04:80",
51 "nodeSid": 104, 50 "nodeSid": 104,
52 - "isEdgeRouter" : false 51 + "isEdgeRouter" : true,
52 + "subnets": [
53 + { "portNo": 1, "subnetIp": "10.0.4.254/24" }
54 + ]
53 } 55 }
56 +
54 }, 57 },
55 58
56 - { "nodeDpid": "of:0000000000000005", "name": "Dallas-R5", "type": "Router_SR", "allowed": true, 59 + { "nodeDpid": "of:0000000000000191", "name": "Spine-R1", "type": "Router_SR", "allowed": true,
57 "latitude": 80.80, "longitude": 90.10, 60 "latitude": 80.80, "longitude": 90.10,
58 - "params": { "routerIp": "192.168.0.5/32", 61 + "params": { "routerIp": "192.168.0.11/32",
59 - "routerMac": "00:00:05:05:05:80", 62 + "routerMac": "00:00:01:00:11:80",
60 "nodeSid": 105, 63 "nodeSid": 105,
61 "isEdgeRouter" : false 64 "isEdgeRouter" : false
62 } 65 }
63 }, 66 },
64 67
65 - { "nodeDpid": "of:0000000000000006", "name": "Dallas-R6", "type": "Router_SR", "allowed": true, 68 + { "nodeDpid": "of:0000000000000192", "name": "Spine-R2", "type": "Router_SR", "allowed": true,
66 "latitude": 80.80, "longitude": 90.10, 69 "latitude": 80.80, "longitude": 90.10,
67 - "params": { "routerIp": "192.168.0.6/32", 70 + "params": { "routerIp": "192.168.0.22/32",
68 - "routerMac": "00:00:07:07:07:80", 71 + "routerMac": "00:00:01:00:22:80",
69 "nodeSid": 106, 72 "nodeSid": 106,
70 - "isEdgeRouter" : true, 73 + "isEdgeRouter" : false
71 - "subnets": [
72 - { "portNo": 1, "subnetIp": "7.7.7.128/24" }
73 - ]
74 } 74 }
75 + },
76 +
77 + { "nodeDpid": "of:0000000000000193", "name": "Spine-R3", "type": "Router_SR", "allowed": true,
78 + "latitude": 80.80, "longitude": 90.10,
79 + "params": { "routerIp": "192.168.0.33/32",
80 + "routerMac": "00:00:01:00:33:80",
81 + "nodeSid": 107,
82 + "isEdgeRouter" : false
75 } 83 }
84 + },
76 85
86 + { "nodeDpid": "of:0000000000000194", "name": "Spine-R4", "type": "Router_SR", "allowed": true,
87 + "latitude": 80.80, "longitude": 90.10,
88 + "params": { "routerIp": "192.168.0.44/32",
89 + "routerMac": "00:00:01:00:44:80",
90 + "nodeSid": 108,
91 + "isEdgeRouter" : false
92 + }
93 + }
77 ] 94 ]
78 } 95 }
......