fix make distcheck with python tests

- bscs.config needed by the vty tests was not picked up as a dist file, because
  its suffix is not 'cfg'. Rename to *.cfg. Apply this rename in
  vty_test_runner.py and osmo-bsc_nat.cfg.
- Remove restart counters after external tests, otherwise distcheck complains
  about uncleaned files.
- Add contrib/ipa.py to EXTRA_DIST, hence add a Makefile.am to contrib/.
  Otherwise the python tests cannot find that dependency.

Change-Id: I42b55cb1125099afc3a8e3f87c0e398426b2e2a9

Makefile.am

@@ -13,6 +13,7 @@ SUBDIRS = \
 	include \
 	src \
 	tests \
+	contrib \
 	$(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig

configure.ac

@@ -263,4 +263,5 @@ AC_OUTPUT(
     tests/nanobts_omlattr/Makefile
     doc/Makefile
     doc/examples/Makefile
+    contrib/Makefile
     Makefile)

contrib/Makefile.am

@@ -0,0 +1 @@
+EXTRA_DIST = ipa.py

doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg

@@ -62,5 +62,5 @@ nat
  timeout ping 20
  timeout pong 5
  ip-dscp 0
- bscs-config-file bscs.config
+ bscs-config-file bscs.cfg
  access-list bla imsi-allow ^11$

tests/Makefile.am

@@ -87,7 +87,7 @@ python-tests: $(BUILT_SOURCES)
 if BUILD_SMPP
 	$(PYTHON) $(srcdir)/smpp_test_runner.py -w $(abs_top_builddir) -v
 endif
-	rm -f $(top_builddir)/hlr.sqlite3
+	rm -f $(top_builddir)/hlr.sqlite3 $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count
 else
 python-tests: $(BUILT_SOURCES)
 	echo "Not running python-based tests (determined at configure-time)"

tests/vty_test_runner.py

@@ -1220,7 +1220,7 @@ def add_nat_test(suite, workdir):
 def nat_bsc_reload(x):
     x.vty.command("configure terminal")
     x.vty.command("nat")
-    x.vty.command("bscs-config-file bscs.config")
+    x.vty.command("bscs-config-file bscs.cfg")
     x.vty.command("end")
 
 def nat_msc_ip(x, ip, port):