Merge "Fixed TD policies"

diff --combined test/placement-tests/request_placement_vfmod.json
index db5a38f,21b9268..e4186d6
--- 1/test/placement-tests/request_placement_vfmod.json
--- 2/test/placement-tests/request_placement_vfmod.json
+++ b/test/placement-tests/request_placement_vfmod.json
@@@ -33,7 -33,9 +33,9 @@@
          "demands": {
              "vFW-SINK": [{
                  "attributes": {
-                     "global-customer-id": "Demonstration",
+                     "global-customer-id": {
+                         "get_param": "chosen_customer_id"
+                     },
                      "cloud-region-id": {
                          "get_param": "chosen_region"
                      },
@@@ -56,7 -58,9 +58,9 @@@
              }],
              "vPGN": [{
                  "attributes": {
-                     "global-customer-id": "Demonstration",
+                     "global-customer-id": {
+                         "get_param": "chosen_customer_id"
+                     },
                      "cloud-region-id": {
                          "get_param": "chosen_region"
                      },
@@@ -82,7 -86,7 +86,7 @@@
          },
          "homing_template_version": "2017-10-10"
      },
 -    "num_solution": 100,
 +    "num_solution": "100",
      "files": {},
      "timeout": 1200
  }