Skip to content

Commit a10385d

Browse files
committed
vpp: run seeds in containers and handle memifs
1 parent 65fa1d2 commit a10385d

File tree

12 files changed

+1739
-260
lines changed

12 files changed

+1739
-260
lines changed

analyzer/server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import (
5858
"github.com/skydive-project/skydive/topology/probes/ovn"
5959
"github.com/skydive-project/skydive/topology/probes/ovsdb"
6060
"github.com/skydive-project/skydive/topology/probes/runc"
61+
"github.com/skydive-project/skydive/topology/probes/vpp"
6162
"github.com/skydive-project/skydive/ui"
6263
"github.com/skydive-project/skydive/websocket"
6364
ws "github.com/skydive-project/skydive/websocket"
@@ -431,6 +432,7 @@ func init() {
431432
graph.NodeMetadataDecoders["OVN"] = ovn.MetadataDecoder
432433
graph.NodeMetadataDecoders["Neutron"] = neutron.MetadataDecoder
433434
graph.NodeMetadataDecoders["Contrail"] = opencontrail.MetadataDecoder
435+
graph.NodeMetadataDecoders["VPP"] = vpp.MetadataDecoder
434436

435437
graph.EdgeMetadataDecoders["NSM"] = nsm.MetadataDecoder
436438
}

statics/css/skydive.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ label {
138138
color: #ffffff;
139139
}
140140

141-
.mode {
141+
.navbar-brand .mode {
142142
color: white;
143143
font-size: 0.8em;
144144
padding-left: 26px;

tests/vpp_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func createLoopback(t *testing.T) string {
3636
if err != nil {
3737
t.Error("Can't create vpp loopback interface ", err)
3838
}
39-
time.Sleep(2 * vpp.VPPPollingTime * time.Millisecond)
39+
time.Sleep(vpp.VPPPollingTime)
4040
return strings.Trim(string(out), "\r\n")
4141
}
4242

@@ -46,7 +46,7 @@ func deleteLoopback(t *testing.T, intf string) string {
4646
if err != nil {
4747
t.Error("Can't delete vpp loopback interface ", intf, " : ", err)
4848
}
49-
time.Sleep(2 * vpp.VPPPollingTime * time.Millisecond)
49+
time.Sleep(vpp.VPPPollingTime)
5050
return strings.Trim(string(out), "\r\n")
5151
}
5252

topology/probes/docker/metadata_easyjson.go

Lines changed: 130 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

topology/probes/docker/metadata_gendecoder.go

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)