-${ns_id} ${EMPTY}
-${ws_ns_id} ${EMPTY}
-${username} ubuntu
-${password} ${EMPTY}
-${vnf_member_index} 1
-${ws_vnf_ip_addr} ${EMPTY}
-${success_return_code} 0
-${alarm_msg} notify_alarm
-${ws_log_file} webhook.log
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+# NS instantiation parameters
+${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+# NS and VNF descriptor package folder and ids
+${VNFD_PKG} cirros_alarm_vnf
+${VNFD_NAME} cirros_alarm-vnf
+${VNFD_FILE} cirros_alarm_vnfd.yaml
+${NEW_VNFD_PKG} new_cirros_alarm_vnf
+${NSD_PKG} cirros_alarm_ns
+${NSD_NAME} cirros_alarm-ns
+
+# NS instance name and id
+${NS_ID} ${EMPTY}
+${NS_NAME} sa_07-alarm_test
+
+# Webhook NS and VNF descriptor package folder and ids
+${WS_VNFD_PKG} hackfest_basic_vnf
+${WS_NSD_PKG} hackfest_basic_ns
+${WS_VNFD_NAME} hackfest_basic-vnf
+${WS_NSD_NAME} hackfest_basic-ns
+
+# Webhook NS instance name and id
+${WS_NS_ID} ${EMPTY}
+${WS_NS_NAME} sa_07-webhook_service_test
+
+# Webhook NS Variables
+${WS_VNF_MEMBER_INDEX} vnf
+${WS_VNF_IP_ADDR} ${EMPTY}
+${WS_LOG_FILE} webhook.log
+${WS_PORT} 5212
+${WS_ALARM_MSG} notify_alarm
+
+# SSH keys and username to be used
+${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub
+${PRIVATEKEY} %{HOME}/.ssh/id_rsa
+${USERNAME} ubuntu
+${PASSWORD} ${EMPTY}
+
+# Prometheus polling interval and retries
+${PROMETHEUS_POLL_RETRIES} 15 times
+${PROMETHEUS_POLL_TIMEOUT} 1 minute
+
+# Prometheus metrics to retrieve
+${METRIC_NAME} osm_cpu_utilization
+
+${SUCCESS_RETURN_CODE} 0