[NPM] better error handling and cache building (#848)

* [NPM] better error handling and cache building

* using const for label operations

* tests correction to discard non-exists delete op

* cleaning up some stale code

* fixing some port issues

* Addressing some comments

* Addressing some comments

* Addressing some comments

* fixing a missed ns- prefix while deleting from ns ipset

* fixing a missed ns- prefix while deleting from ns ipset

* resducing complexity when pod ip changes

* Adding some test validations

* Adding some test validations

* Adding some test validations

* removing more unsed fields

* removing redundant checks

* Adding improvement of podinformer

* removing the deepcopy logic

* streamlining some redudant log messages

* moving a comment

Author: vakalapa

npm/ipsm/ipsm.go

@@ -188,20 +188,24 @@ func (ipsMgr *IpsetManager) DeleteFromList(listName string, setName string) erro
 	exists, _ := ipsMgr.SetExists(setName)
 
 	// if set does not exist, then return because the ipset call will fail due to set not existing
+	// TODO make sure these are info and not errors, use NPmErr
 	if !exists {
-		return fmt.Errorf("Set [%s] does not exist when attempting to delete from list [%s]", setName, listName)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "Set [%s] does not exist when attempting to delete from list [%s]", setName, listName)
+		return nil
 	}
 
 	//Check if list being added exists in the listmap, if it exists we don't care about the set type
 	exists, listtype := ipsMgr.SetExists(listName)
 
 	// if set does not exist, then return because the ipset call will fail due to set not existing
 	if !exists {
-		return fmt.Errorf("Set [%s] does not exist when attempting to add to list [%s]", setName, listName)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "Set [%s] does not exist when attempting to add to list [%s]", setName, listName)
+		return nil
 	}
 
 	if listtype != util.IpsetSetListFlag {
-		return fmt.Errorf("Set [%s] is of the wrong type when attempting to delete list [%s], actual type [%s]", setName, listName, listtype)
+		metrics.SendErrorLogAndMetric(util.IpsmID, "Set [%s] is of the wrong type when attempting to delete list [%s], actual type [%s]", setName, listName, listtype)
+		return nil
 	}
 
 	if _, exists := ipsMgr.ListMap[listName]; !exists {
@@ -552,7 +556,6 @@ func (ipsMgr *IpsetManager) DestroyNpmIpsets() error {
 		return nil
 	}
 
-	log.Logf("{DestroyNpmIpsets} Reply from command %s executed is %s", cmdName+" "+cmdArgs, reply)
 	re := regexp.MustCompile("Name: (" + util.AzureNpmPrefix + "\\d+)")
 	ipsetRegexSlice := re.FindAllSubmatch(reply, -1)
 

npm/ipsm/ipsm_test.go

@@ -138,12 +138,12 @@ func TestDeleteFromList(t *testing.T) {
 	}
 
 	// Delete set from list and validate set is not in list anymore.
-	if err := ipsMgr.DeleteFromList(listName, "nonexistentsetname"); err == nil {
+	if err := ipsMgr.DeleteFromList(listName, "nonexistentsetname"); err != nil {
 		t.Errorf("TestDeleteFromList failed @ ipsMgr.DeleteFromList %v", err)
 	}
 
 	// Delete set from list, but list isn't of list type
-	if err := ipsMgr.DeleteFromList(setName, setName); err == nil {
+	if err := ipsMgr.DeleteFromList(setName, setName); err != nil {
 		t.Errorf("TestDeleteFromList failed @ ipsMgr.DeleteFromList %v", err)
 	}