Include calico.py and ipam.py in coverage reports

nose.cfg

@@ -1,4 +1,4 @@
 [nosetests]
 with-coverage=1
 cover-erase=1
-cover-package=calico_cni
+cover-package=calico_cni,calico,ipam

tests/unit/test_cni_plugin.py

@@ -355,6 +355,34 @@ def test_assign_ip_no_ip(self):
         e = err.exception
         assert_equal(e.code, ERR_CODE_GENERIC)
 
+    def test_assign_ip_invalid_ip4(self):
+        # Mock _call_ipam_plugin.
+        rc = 0
+        ipam_result = json.dumps({"ip4": {"ip": "somebadip4"}})
+        self.plugin._call_ipam_plugin = MagicMock(spec=self.plugin._call_ipam_plugin)
+        self.plugin._call_ipam_plugin.return_value = rc, ipam_result
+        env = {CNI_COMMAND_ENV: CNI_CMD_ADD}
+
+        # Call _assign_ips.
+        with assert_raises(SystemExit) as err:
+            self.plugin._assign_ips(env)
+        e = err.exception
+        assert_equal(e.code, ERR_CODE_GENERIC)
+
+    def test_assign_ip_invalid_ip6(self):
+        # Mock _call_ipam_plugin.
+        rc = 0
+        ipam_result = json.dumps({"ip6": {"ip": "somebadip6"}})
+        self.plugin._call_ipam_plugin = MagicMock(spec=self.plugin._call_ipam_plugin)
+        self.plugin._call_ipam_plugin.return_value = rc, ipam_result
+        env = {CNI_COMMAND_ENV: CNI_CMD_ADD}
+
+        # Call _assign_ips.
+        with assert_raises(SystemExit) as err:
+            self.plugin._assign_ips(env)
+        e = err.exception
+        assert_equal(e.code, ERR_CODE_GENERIC)
+
     def test_release_ip_mainline(self):
         # Mock _call_ipam_plugin.
         rc = 0