Merge pull request #196 from squeed/cni-v1.1-status

add support for cni STATUS verb

pkg/ocicni/ocicni.go

@@ -803,6 +803,10 @@ func (network *cniNetwork) deleteFromNetwork(ctx context.Context, rt *libcni.Run
 	return cni.DelNetworkList(ctx, network.config, rt)
 }
 
+func (network *cniNetwork) getNetworkStatus(ctx context.Context, cni *libcni.CNIConfig) error {
+	return cni.GetStatusNetworkList(ctx, network.config)
+}
+
 func buildCNIRuntimeConf(podNetwork *PodNetwork, ifName string, runtimeConfig *RuntimeConfig) (*libcni.RuntimeConf, error) {
 	if runtimeConfig == nil {
 		runtimeConfig = &RuntimeConfig{}
@@ -887,9 +891,17 @@ func buildCNIRuntimeConf(podNetwork *PodNetwork, ifName string, runtimeConfig *R
 	return rt, nil
 }
 
+// Status returns error if the default network is not configured, or if
+// the default network reports a failing STATUS code.
 func (plugin *cniNetworkPlugin) Status() error {
-	if plugin.getDefaultNetwork() == nil {
+	return plugin.StatusWithContext(context.Background())
+}
+
+func (plugin *cniNetworkPlugin) StatusWithContext(ctx context.Context) error {
+	defaultNet := plugin.getDefaultNetwork()
+	if defaultNet == nil {
 		return fmt.Errorf(errMissingDefaultNetwork, plugin.confDir)
 	}
-	return nil
+
+	return defaultNet.getNetworkStatus(ctx, plugin.cniConfig)
 }

pkg/ocicni/ocicni_test.go

@@ -70,6 +70,8 @@ type fakeExec struct {
 	plugins  []*fakePlugin
 
 	failFind bool
+
+	failStatus bool
 }
 
 type TestConf struct {
@@ -132,6 +134,11 @@ func (f *fakeExec) ExecPlugin(ctx context.Context, pluginPath string, stdinData
 	case "VERSION":
 		// Just return all supported versions
 		return json.Marshal(version.All)
+	case "STATUS":
+		if f.failStatus {
+			return nil, errors.New("status fails")
+		}
+		return nil, nil
 	default:
 		// Should never be reached
 		Expect(false).To(BeTrue())
@@ -363,9 +370,13 @@ var _ = Describe("ocicni operations", func() {
 	})
 
 	It("finds and refinds an asynchronously written default network configuration", func() {
-		ocicni, err := initCNI(&fakeExec{}, "", "test", tmpDir, true, "/opt/cni/bin")
+		f := &fakeExec{}
+		ocicni, err := initCNI(f, "", "test", tmpDir, true, "/opt/cni/bin")
 		Expect(err).NotTo(HaveOccurred())
 
+		err = ocicni.Status()
+		Expect(err).To(HaveOccurred())
+
 		// Write the default network config
 		_, confPath, err := writeConfig(tmpDir, "10-test.conf", "test", "myplugin", "0.3.1")
 		Expect(err).NotTo(HaveOccurred())
@@ -384,12 +395,20 @@ var _ = Describe("ocicni operations", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(ocicni.Status, 5).Should(HaveOccurred())
 
-		// Write the default network config again and wait for status
+		// Write the default network config again, this time with v1.1, and wait for status
 		// to be OK
-		_, _, err = writeConfig(tmpDir, "10-test.conf", "test", "myplugin", "0.3.1")
+		_, _, err = writeConfig(tmpDir, "10-test.conf", "test", "myplugin", "1.1.0")
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(ocicni.Status, 5).Should(Succeed())
 
+		f.failStatus = true
+		err = ocicni.Status()
+		Expect(err).To(HaveOccurred())
+
+		f.failStatus = false
+		err = ocicni.Status()
+		Expect(err).NotTo(HaveOccurred())
+
 		Expect(ocicni.Shutdown()).NotTo(HaveOccurred())
 	})
 

pkg/ocicni/types.go

@@ -125,6 +125,8 @@ type NetResult struct {
 }
 
 // CNIPlugin is the interface that needs to be implemented by a plugin.
+//
+//nolint:interfacebloat // existing API
 type CNIPlugin interface {
 	// Name returns the plugin's name. This will be used when searching
 	// for a plugin by name, e.g.
@@ -157,6 +159,8 @@ type CNIPlugin interface {
 	// NetworkStatus returns error if the network plugin is in error state
 	Status() error
 
+	StatusWithContext(ctx context.Context) error
+
 	// Shutdown terminates all driver operations
 	Shutdown() error
 }