Change e2e test to remove vpcPath from networkInfo (vmware-tanzu#905)

vpcPath is removed from networkinfo CRD, change e2e to verify
if private ip blocks is empty.

Author: seanpang-vmware

test/e2e/nsx_networkinfo_test.go

@@ -163,15 +163,15 @@ func testUpdateVPCNetworkconfigNetworkInfo(t *testing.T) {
 	networkInfo := assureNetworkInfo(t, ns, ns)
 	require.NotNil(t, networkInfo)
 
-	networkInfoNew := getVPCPathFromNetworkInfo(t, ns, networkInfo.Name)
+	networkInfoNew := getNetworkInfoWithPrivateIPs(t, ns, networkInfo.Name)
 	privateIPs := networkInfoNew.VPCs[0].PrivateIPs
 	assert.Contains(t, privateIPs, customizedPrivateCIDR1, "privateIPs %s should contain %s", privateIPs, customizedPrivateCIDR1)
 	assert.Contains(t, privateIPs, customizedPrivateCIDR2, "privateIPs %s should contain %s", privateIPs, customizedPrivateCIDR1)
 
 	vncPath, _ := filepath.Abs("./manifest/testVPC/customize_networkconfig_updated.yaml")
 	require.NoError(t, applyYAML(vncPath, ""))
 
-	networkInfoNew = getVPCPathFromNetworkInfo(t, ns, networkInfo.Name)
+	networkInfoNew = getNetworkInfoWithPrivateIPs(t, ns, networkInfo.Name)
 	privateIPs = networkInfoNew.VPCs[0].PrivateIPs
 	assert.Contains(t, privateIPs, customizedPrivateCIDR3, "privateIPs %s should contain %s", privateIPs, customizedPrivateCIDR3)
 }
@@ -262,16 +262,16 @@ func assureNamespaceDeleted(t *testing.T, ns string) {
 	return
 }
 
-func getVPCPathFromNetworkInfo(t *testing.T, ns, networkInfoName string) (networkInfo *v1alpha1.NetworkInfo) {
+func getNetworkInfoWithPrivateIPs(t *testing.T, ns, networkInfoName string) (networkInfo *v1alpha1.NetworkInfo) {
 	deadlineCtx, deadlineCancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer deadlineCancel()
 	err := wait.PollUntilContextTimeout(deadlineCtx, 1*time.Second, defaultTimeout, false, func(ctx context.Context) (done bool, err error) {
 		networkInfo, err = testData.crdClientset.CrdV1alpha1().NetworkInfos(ns).Get(ctx, networkInfoName, v1.GetOptions{})
 		if err != nil {
-			t.Logf("Check VPC path of vpcnetworkconfigurations: %v, error: %+v", networkInfo, err)
-			return false, fmt.Errorf("error when waiting for vpcnetworkconfigurations VPC path: %s", networkInfoName)
+			t.Logf("Check private ips of networkinfo: %v, error: %+v", networkInfo, err)
+			return false, fmt.Errorf("error when waiting for vpcnetworkinfo private ips: %s", networkInfoName)
 		}
-		if len(networkInfo.VPCs) > 0 && networkInfo.VPCs[0].VPCPath != "" {
+		if len(networkInfo.VPCs) > 0 && len(networkInfo.VPCs[0].PrivateIPs) > 0 {
 			return true, nil
 		}
 		return false, nil