fixes from vCPE testing

Issue-ID: INT-717
Change-Id: If2c44e08288eee955b7a3548a802be37a15a601e
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
index 2725954..d2072e2 100644
--- a/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
+++ b/test/vcpe/preload_templates/template.vcpe_infra_vfmodule.json
@@ -105,11 +105,11 @@
 	},
 	{
 	"vnf-parameter-name": "mr_ip_addr",
-	"vnf-parameter-value": "10.12.5.239"
+	"vnf-parameter-value": "${mr_ip_addr}"
 	},
 	{
 	"vnf-parameter-name": "mr_ip_port",
-	"vnf-parameter-value": "30227"
+	"vnf-parameter-value": "${mr_ip_port}"
 	},
 	{
 	"vnf-parameter-name": "vaaa_name_0",
@@ -153,11 +153,11 @@
 	},
 	{
 	"vnf-parameter-name": "demo_artifacts_version",
-	"vnf-parameter-value": "1.3.0"
+	"vnf-parameter-value": "1.3.0-SNAPSHOT"
 	},
 	{
 	"vnf-parameter-name": "install_script_version",
-	"vnf-parameter-value": "1.2.0-SNAPSHOT"
+	"vnf-parameter-value": "1.3.0-SNAPSHOT"
 	},
 	{
 	"vnf-parameter-name": "key_name",