update nomad files

deploy/asapo_services/asap3.tfvars

 elk_logs = true
 
+asapo_image_tag = "feature_ASAPO-108-kubernetes-deployment.latest"
+
 service_dir="/gpfs/asapo/shared/service_dir"
 online_dir="/beamline"
 offline_dir="/asap3"

deploy/asapo_services/copy_asap3.sh.in

 #!/usr/bin/env bash
 
-scp scripts/* asap3-utl01:@NOMAD_INSTALL@/terraform/
-scp asap3.tfvars asap3-utl01:@NOMAD_INSTALL@/terraform/
-ssh asap3-utl01 chown asapo: -R @NOMAD_INSTALL@/terraform/
-ssh asap3-utl01 rm @NOMAD_INSTALL@/terraform/auth_secret.key
-ssh asap3-utl01 ln -s @NOMAD_INSTALL@/access/secret.key @NOMAD_INSTALL@/terraform/auth_secret.key
+scp scripts/* root@asap3-utl01:@NOMAD_INSTALL@/terraform/
+scp asap3.tfvars root@asap3-utl01:@NOMAD_INSTALL@/terraform/
+ssh -l root asap3-utl01 chown asapo: -R @NOMAD_INSTALL@/terraform/
+ssh -l root asap3-utl01 rm @NOMAD_INSTALL@/terraform/auth_secret.key
+ssh -l root asap3-utl01 ln -s @NOMAD_INSTALL@/access/secret.key @NOMAD_INSTALL@/terraform/auth_secret.key

deploy/asapo_services/scripts/asapo-fts.nmd.tpl

@@ -14,7 +14,7 @@ job "asapo-file-transfer" {
   }
 
   group "file-transfer" {
-    count = ${n_file-transfer}
+    count = ${n_fts}
     restart {
       attempts = 2
       interval = "3m"
@@ -49,12 +49,12 @@ job "asapo-file-transfer" {
 
       resources {
         network {
-          port "file-transfer" {}
+          port "fts" {}
         }
       }
 
       service {
-        port = "file-transfer"
+        port = "fts"
         name = "asapo-file-transfer"
         check {
           name     = "asapo-file-transfer-alive"

deploy/asapo_services/scripts/asapo-mongo.nmd.tpl

@@ -45,7 +45,7 @@ job "asapo-mongo" {
 
       service {
         port = "mongo"
-        name = "mongo"
+        name = "asapo-mongodb"
         check {
           type     = "script"
           name     = "alive"

deploy/asapo_services/scripts/asapo-services.nmd.tpl

@@ -120,7 +120,7 @@ job "asapo-services" {
         check {
           name     = "alive"
           type     = "http"
-          path     = "/receivers"
+          path     = "/asapo-receiver"
           interval = "10s"
           timeout  = "2s"
           initial_status =   "passing"

deploy/asapo_services/scripts/resources_services.tf

@@ -22,7 +22,7 @@ resource "null_resource" "fluentd" {
 
 resource "null_resource" "mongo" {
   provisioner "local-exec" {
-    command = "asapo-wait-service mongo"
+    command = "asapo-wait-service asapo-mongodb"
   }
   depends_on = [nomad_job.asapo-mongo]
 
@@ -53,7 +53,7 @@ resource "null_resource" "asapo-broker" {
 
 resource "null_resource" "asapo-fts" {
   provisioner "local-exec" {
-    command = "asapo-wait-service asapo-fts"
+    command = "asapo-wait-service asapo-file-transfer"
   }
   depends_on = [nomad_job.asapo-fts]
 }

tests/manual/python_tests/consumer/consumer_api.py

@@ -10,7 +10,7 @@ group_id = broker.generate_group_id()
 
 _, meta = broker.get_by_id(1,group_id, meta_only=True)
 
-meta["buf_id"]=0
+#meta["buf_id"]=0
 data = broker.retrieve_data(meta)
 
 print (meta)

tests/manual/python_tests/consumer/test_asap3.sh

+export PYTHONPATH=/Users/yakubov/projects/asapo/cmake-build-debug/consumer/api/python
+export token=KmUDdacgBzaOD3NIJvN1NmKGqWKtx0DK-NyPjdpeWkc=
+python3 consumer_api.py asap3-utl.desy.de:8400 /gpfs/asapo/shared/test_dir/test_facility/gpfs/test/2019/data/asapo_test asapo_test $token