update

Signed-off-by: Hang Yan <[email protected]>

Author: hangyan

pkg/antctl/antctl.go

@@ -753,8 +753,8 @@ $ antctl get podmulticaststats pod -n namespace`,
 		},
 		{
 			cobraCommand:      packetcapture.Command,
-			supportAgent:      true,
-			supportController: true,
+			supportAgent:      false,
+			supportController: false,
 		},
 		{
 			cobraCommand:      proxy.Command,

pkg/antctl/command_list_test.go

@@ -65,12 +65,12 @@ func TestGetDebugCommands(t *testing.T) {
 		{
 			name:     "Antctl running against controller mode",
 			mode:     "controller",
-			expected: [][]string{{"version"}, {"get", "networkpolicy"}, {"get", "appliedtogroup"}, {"get", "addressgroup"}, {"get", "controllerinfo"}, {"supportbundle"}, {"traceflow"}, {"packetcapture"}, {"get", "featuregates"}},
+			expected: [][]string{{"version"}, {"get", "networkpolicy"}, {"get", "appliedtogroup"}, {"get", "addressgroup"}, {"get", "controllerinfo"}, {"supportbundle"}, {"traceflow"}, {"get", "featuregates"}},
 		},
 		{
 			name:     "Antctl running against agent mode",
 			mode:     "agent",
-			expected: [][]string{{"version"}, {"get", "podmulticaststats"}, {"log-level"}, {"get", "networkpolicy"}, {"get", "appliedtogroup"}, {"get", "addressgroup"}, {"get", "agentinfo"}, {"get", "podinterface"}, {"get", "ovsflows"}, {"trace-packet"}, {"get", "serviceexternalip"}, {"get", "memberlist"}, {"get", "bgppolicy"}, {"get", "bgppeers"}, {"get", "bgproutes"}, {"supportbundle"}, {"traceflow"}, {"packetcapture"}, {"get", "featuregates"}},
+			expected: [][]string{{"version"}, {"get", "podmulticaststats"}, {"log-level"}, {"get", "networkpolicy"}, {"get", "appliedtogroup"}, {"get", "addressgroup"}, {"get", "agentinfo"}, {"get", "podinterface"}, {"get", "ovsflows"}, {"trace-packet"}, {"get", "serviceexternalip"}, {"get", "memberlist"}, {"get", "bgppolicy"}, {"get", "bgppeers"}, {"get", "bgproutes"}, {"supportbundle"}, {"traceflow"}, {"get", "featuregates"}},
 		},
 		{
 			name:     "Antctl running against flow-aggregator mode",

pkg/antctl/raw/packetcapture/command.go

@@ -48,6 +48,7 @@ var (
 	getCopier      = getPodFile
 	defaultFS      = afero.NewOsFs()
 )
+
 var option = &struct {
 	source    string
 	dest      string
@@ -59,11 +60,11 @@ var option = &struct {
 }{}
 
 var packetCaptureExample = strings.TrimSpace(`
-  Start capture packets from pod1 to pod2, both Pods are in Namespace default
+  Start capturing packets from pod1 to pod2, both Pods are in Namespace default
   $ antctl packetcaputre -S pod1 -D pod2
-  Start capture packets from pod1 in Namespace ns1 to a destination IP
+  Start capturing packets from pod1 in Namespace ns1 to a destination IP
   $ antctl packetcapture -S ns1/pod1 -D 192.168.123.123
-  Start capture UDP packets from pod1 to pod2, with destination port 1234
+  Start capturing UDP packets from pod1 to pod2, with destination port 1234
   $ antctl packetcapture -S pod1 -D pod2 -f udp,udp_dst=1234
   Save the packets file to a specified directory
   $ antctl packetcapture -S 192.168.123.123 -D pod2 -f tcp,tcp_dst=80 -o /tmp
@@ -137,9 +138,20 @@ func getPodFile(cmd *cobra.Command) (PodFileCopy, error) {
 	}, nil
 }
 
+func getPCName(src, dest string) string {
+	replace := func(s string) string {
+		return strings.ReplaceAll(s, "/", "-")
+	}
+	prefix := fmt.Sprintf("%s-%s", replace(src), replace(dest))
+	if option.nowait {
+		return prefix
+	}
+	return fmt.Sprintf("%s-%s", prefix, rand.String(8))
+}
+
 func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 	option.timeout, _ = cmd.Flags().GetDuration("timeout")
-	if option.timeout > time.Hour {
+	if option.timeout > 300*time.Second {
 		return errors.New("timeout cannot be longer than 1 hour")
 	}
 	if option.timeout == 0 {
@@ -157,7 +169,7 @@ func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return fmt.Errorf("error when constructing a PacketCapture CR: %w", err)
 	}
-	createCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	createCtx, cancel := context.WithTimeout(cmd.Context(), 5*time.Second)
 	defer cancel()
 
 	if _, err := antreaClient.CrdV1alpha1().PacketCaptures().Create(createCtx, pc, metav1.CreateOptions{}); err != nil {
@@ -189,7 +201,6 @@ func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 			}
 		}
 		return false, nil
-
 	})
 
 	if wait.Interrupted(err) {
@@ -204,14 +215,16 @@ func packetCaptureRunE(cmd *cobra.Command, args []string) error {
 	splits := strings.Split(latestPC.Status.FilePath, ":")
 	fileName := filepath.Base(splits[1])
 	copier, _ := getCopier(cmd)
-	err = copier.CopyFromPod(context.TODO(), env.GetAntreaNamespace(), splits[0], "antrea-agent", splits[1], option.outputDir)
-	if err == nil {
-		fmt.Fprintf(cmd.OutOrStdout(), "Captured packets file: %s\n", filepath.Join(option.outputDir, fileName))
+	if err := copier.CopyFromPod(context.TODO(), env.GetAntreaNamespace(), splits[0], "antrea-agent", splits[1], option.outputDir); err == nil {
+		return err
 	}
-	return err
+	fmt.Fprintf(cmd.OutOrStdout(), "Captured packets file: %s\n", filepath.Join(option.outputDir, fileName))
+	return nil
 }
 
-func parseEndpoint(endpoint string) (pod *v1alpha1.PodReference, ip *string) {
+func parseEndpoint(endpoint string) (*v1alpha1.PodReference, *string) {
+	var pod *v1alpha1.PodReference
+	var ip *string
 	parsedIP := net.ParseIP(endpoint)
 	if parsedIP != nil && parsedIP.To4() != nil {
 		ip = ptr.To(parsedIP.String())
@@ -229,23 +242,12 @@ func parseEndpoint(endpoint string) (pod *v1alpha1.PodReference, ip *string) {
 			}
 		}
 	}
-	return
-}
-
-func getPCName(src, dest string) string {
-	replace := func(s string) string {
-		return strings.ReplaceAll(s, "/", "-")
-	}
-	prefix := fmt.Sprintf("%s-%s", replace(src), replace(dest))
-	if option.nowait {
-		return prefix
-	}
-	return fmt.Sprintf("%s-%s", prefix, rand.String(8))
+	return pod, ip
 }
 
 func parseFlow() (*v1alpha1.Packet, error) {
 	trimFlow := strings.ReplaceAll(option.flow, " ", "")
-	fields, err := getFlowFields(cleanFlow)
+	fields, err := getFlowFields(trimFlow)
 	if err != nil {
 		return nil, fmt.Errorf("error when parsing the flow: %w", err)
 	}

pkg/antctl/raw/packetcapture/command_test.go

@@ -110,14 +110,14 @@ func TestRun(t *testing.T) {
 			src:       srcPod,
 			dst:       dstPod,
 			flow:      "icmp",
-			expectErr: "timeout waiting for PacketCapture done",
+			expectErr: "timeout while waiting for PacketCapture to complete",
 		},
 		{
 			name:      "invalid-packetcapture",
 			src:       ipv4,
 			dst:       ipv4,
 			flow:      "icmp",
-			expectErr: "error when filling up PacketCapture config: one of source and destination must be a Pod",
+			expectErr: "error when constructing a PacketCapture CR: one of source and destination must be a Pod",
 		},
 	}
 	for _, tt := range tcs {
@@ -159,6 +159,7 @@ func TestRun(t *testing.T) {
 			Command.SetOutput(buf)
 			Command.SetOut(buf)
 			Command.SetErr(buf)
+			Command.SetContext(context.Background())
 
 			err := packetCaptureRunE(Command, nil)
 			if tt.expectErr == "" {