Fix iptable rules generated for Ingress NetworkPolicy when both port and IP block specified

[kitt1987]

Fix #3653

[murali-reddy]

@kitt1987 thanks for the PR.

Since CI can not run from the branches on forked repo I pushed your branch to weave repo. CI seems to be failing in an unrelated test but what seems to be result of new test in this PR. Can you please add cleanup logic end of the test to delete pod and network policy?

[kitt1987]

OK.
I've fixed it in the last commit.

[kitt1987]

@murali-reddy
Could you plz help run the CI again? I don't know exactly why the netlify failed.

[murali-reddy]

I rerun the CI. For some reason 602_proxy_docker_py_test.sh continues to fail. I will check again and revert back.

[kitt1987]

Thanks

[KresoDenis]

Will this get into next release.

[bboreham]

CI ran successfully at https://circleci.com/workflow-run/d066cfca-f297-4b11-86a3-0339a5424e36
I experimented with rebasing this against the 2.5 branch, but the unit test relies on other changes not on that branch.