Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
tom
2014-09-22 11:41:06 -0700
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
25236f5b79e3b710f5b239f0aacba4bd01ccecbd
25236f5b
2 parents
ca90c46b
1b9f4dcf
Merge remote-tracking branch 'origin/master'
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java
providers/openflow/device/src/test/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProviderTest.java
core/net/src/test/java/org/onlab/onos/net/device/impl/DistributedDeviceManagerTest.java
View file @
25236f5
...
...
@@ -2,7 +2,6 @@ package org.onlab.onos.net.device.impl;
import
org.junit.After
;
import
org.junit.Before
;
import
org.junit.Ignore
;
import
org.junit.Test
;
import
org.onlab.onos.event.Event
;
import
org.onlab.onos.net.Device
;
...
...
@@ -46,7 +45,6 @@ import static org.onlab.onos.net.device.DeviceEvent.Type.*;
/**
* Test codifying the device service & device provider service contracts.
*/
@Ignore
public
class
DistributedDeviceManagerTest
{
private
static
final
ProviderId
PID
=
new
ProviderId
(
"of"
,
"foo"
);
...
...
@@ -84,8 +82,12 @@ public class DistributedDeviceManagerTest {
// avoid accidentally joining other cluster
config
.
getGroupConfig
().
setName
(
UUID
.
randomUUID
().
toString
());
// quickly form single node cluster
config
.
getNetworkConfig
().
getJoin
().
getMulticastConfig
()
.
setMulticastTimeoutSeconds
(
0
);
config
.
getNetworkConfig
().
getJoin
()
.
getTcpIpConfig
()
.
setEnabled
(
true
).
setConnectionTimeoutSeconds
(
0
);
config
.
getNetworkConfig
().
getJoin
()
.
getMulticastConfig
()
.
setEnabled
(
false
);
dstore
.
theInstance
=
Hazelcast
.
newHazelcastInstance
(
config
);
dstore
.
activate
();
mgr
.
store
=
dstore
;
...
...
providers/openflow/device/src/test/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProviderTest.java
View file @
25236f5
...
...
@@ -115,6 +115,7 @@ public class OpenFlowDeviceProviderTest {
.
setDesc
(
PD3
)
.
build
();
controller
.
listener
.
portChanged
(
DPID1
,
stat
);
assertNotNull
(
"never went throught the provider service"
,
registry
.
descr
);
assertEquals
(
"port status unhandled"
,
3
,
registry
.
ports
.
get
(
DID1
).
size
());
}
...
...
@@ -129,6 +130,7 @@ public class OpenFlowDeviceProviderTest {
DeviceProvider
provider
;
Set
<
DeviceId
>
connected
=
new
HashSet
<
DeviceId
>();
Multimap
<
DeviceId
,
PortDescription
>
ports
=
HashMultimap
.
create
();
PortDescription
descr
=
null
;
@Override
public
DeviceProviderService
register
(
DeviceProvider
provider
)
{
...
...
@@ -175,9 +177,8 @@ public class OpenFlowDeviceProviderTest {
@Override
public
void
portStatusChanged
(
DeviceId
deviceId
,
PortDescription
portDescription
)
{
System
.
err
.
println
(
deviceId
+
":"
+
portDescription
.
toString
());
System
.
err
.
println
(
ports
.
put
(
deviceId
,
portDescription
));
ports
.
put
(
deviceId
,
portDescription
);
descr
=
portDescription
;
}
}
...
...
Please
register
or
login
to post a comment