fix ci errors

Author: pfandzelter

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
       - name: mypy-check2
         uses: theCapypara/mypy-check@master
         with:
-          requirements: types-toml
+          requirements: types-toml numpy types-request mypy-protobuf
           path: "*.py"
           mypy_flags: "--config setup.cfg"
 

celestial.go

@@ -141,7 +141,7 @@ func main() {
 	// listen for SIGINT
 	c := make(chan os.Signal, 1)
 
-	signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL)
+	signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 
 	<-c
 

pkg/orchestrator/orchestrator.go

@@ -37,8 +37,6 @@ type Orchestrator struct {
 
 	virt VirtualizationBackend
 
-	host Host
-
 	initialized bool
 }
 

pkg/orchestrator/types.go

@@ -26,9 +26,6 @@ const (
 	ACTIVE
 )
 
-const defaultLatency = 0
-const defaultBandwidth = 1000_000_000
-
 type Link struct {
 	// Blocked is true if the link is blocked
 	Blocked bool
@@ -51,10 +48,6 @@ func (m MachineID) String() string {
 	return fmt.Sprintf("%d.%d", m.Group, m.Id)
 }
 
-func (m MachineID) lt(b MachineID) bool {
-	return m.Group < b.Group || (m.Group == b.Group && m.Id < b.Id)
-}
-
 type Host uint8
 
 type NetworkState map[MachineID]map[MachineID]*Link

pkg/server/server.go

@@ -251,7 +251,7 @@ func (s *Server) Update(stream celestial.Celestial_UpdateServer) error {
 		}
 	}
 
-	log.Debugf("parse time: %v", time.Now().Sub(parseStart))
+	log.Debugf("parse time: %v", time.Since(parseStart))
 
 	err := s.o.Update(&orchestrator.State{
 		NetworkState:  ns,

test/integration/celestial_test.go

@@ -377,27 +377,23 @@ func testModifyLinks(t *testing.T, A int, B int, latency int) {
 	u := &testUpdateServer{
 		ld: []*celestial.StateUpdateRequest_NetworkDiff{
 			{
-				Id: &celestial.MachineID{
+				Source: &celestial.MachineID{
 					Group: uint32(vms[A].group),
 					Id:    uint32(vms[A].id),
 				},
-				Links: []*celestial.StateUpdateRequest_NetworkDiff_Link{
-					{
-						Target: &celestial.MachineID{
-							Group: uint32(vms[B].group),
-							Id:    uint32(vms[B].id),
-						},
-						Latency:   uint32(latency * 1000), // convert to microseconds
-						Bandwidth: 10000,
-						Next: &celestial.MachineID{
-							Group: uint32(vms[B].group),
-							Id:    uint32(vms[B].id),
-						},
-						Prev: &celestial.MachineID{
-							Group: uint32(vms[A].group),
-							Id:    uint32(vms[A].id),
-						},
-					},
+				Target: &celestial.MachineID{
+					Group: uint32(vms[B].group),
+					Id:    uint32(vms[B].id),
+				},
+				Latency:   uint32(latency * 1000), // convert to microseconds
+				Bandwidth: 10000,
+				Next: &celestial.MachineID{
+					Group: uint32(vms[B].group),
+					Id:    uint32(vms[B].id),
+				},
+				Prev: &celestial.MachineID{
+					Group: uint32(vms[A].group),
+					Id:    uint32(vms[A].id),
 				},
 			},
 		},
@@ -471,19 +467,15 @@ func TestBlockLink(t *testing.T) {
 	u := &testUpdateServer{
 		ld: []*celestial.StateUpdateRequest_NetworkDiff{
 			{
-				Id: &celestial.MachineID{
+				Source: &celestial.MachineID{
 					Group: uint32(vms[A].group),
 					Id:    uint32(vms[A].id),
 				},
-				Links: []*celestial.StateUpdateRequest_NetworkDiff_Link{
-					{
-						Target: &celestial.MachineID{
-							Group: uint32(vms[B].group),
-							Id:    uint32(vms[B].id),
-						},
-						Blocked: true,
-					},
+				Target: &celestial.MachineID{
+					Group: uint32(vms[B].group),
+					Id:    uint32(vms[B].id),
 				},
+				Blocked: true,
 			},
 		},
 	}