Add flags to identify and stub Mesos requests

src/js/core/MesosStream.js

@@ -1,4 +1,6 @@
 import { stream } from "@dcos/mesos-client";
 
 export const MesosStreamType = Symbol("MesosStreamType");
-export default stream({ type: "SUBSCRIBE" }).publishReplay().refCount();
+export default stream({ type: "SUBSCRIBE" }, "/mesos/api/v1?subscribe")
+  .publishReplay()
+  .refCount();

src/js/stores/MesosStateStore.js

@@ -74,7 +74,10 @@ class MesosStateStore extends GetSetBaseStore {
   subscribe() {
     const mesosStream = container.get(MesosStreamType);
     const parsers = pipe(...Object.values(mesosStreamParsers));
-    const getMasterRequest = request({ type: "GET_MASTER" }).retry(3);
+    const getMasterRequest = request(
+      { type: "GET_MASTER" },
+      "/mesos/api/v1?get_master"
+    ).retry(3);
 
     this.stream = mesosStream
       .merge(getMasterRequest)

tests/_fixtures/1-service-with-executor-task/mesos-get-master.json

@@ -0,0 +1,33 @@
+{
+  "get_master": {
+    "master_info": {
+      "address": {
+        "hostname": "10.0.7.122",
+        "ip": "10.0.7.122",
+        "port": 5050
+      },
+      "capabilities": [
+        {
+          "type": "AGENT_UPDATE"
+        }
+      ],
+      "domain": {
+        "fault_domain": {
+          "region": {
+            "name": "region-1"
+          },
+          "zone": {
+            "name": "zone-1"
+          }
+        }
+      },
+      "hostname": "10.0.7.122",
+      "id": "b3bd182c-c6d7-463e-8bf0-06cd5807df4e",
+      "ip": 2198274058,
+      "pid": "master@10.0.7.122:5050",
+      "port": 5050,
+      "version": "0.27.0"
+    }
+  },
+  "type": "GET_MASTER"
+}

tests/_fixtures/healthy-tasks-in-mesos-and-marathon/mesos-get-master.json

@@ -0,0 +1,33 @@
+{
+  "get_master": {
+    "master_info": {
+      "address": {
+        "hostname": "10.0.4.58",
+        "ip": "10.0.4.58",
+        "port": 5050
+      },
+      "capabilities": [
+        {
+          "type": "AGENT_UPDATE"
+        }
+      ],
+      "domain": {
+        "fault_domain": {
+          "region": {
+            "name": "region-1"
+          },
+          "zone": {
+            "name": "zone-1"
+          }
+        }
+      },
+      "hostname": "10.0.4.58",
+      "id": "74f1836b-6784-4030-816e-aacbdd45ff57",
+      "ip": 2198274058,
+      "pid": "master@10.0.4.58:5050",
+      "port": 5050,
+      "version": "1.2.0"
+    }
+  },
+  "type": "GET_MASTER"
+}

tests/_fixtures/marathon-1-task/mesos-get-master.json

@@ -0,0 +1,33 @@
+{
+  "get_master": {
+    "master_info": {
+      "address": {
+        "hostname": "172.17.8.101",
+        "ip": "172.17.8.101",
+        "port": 5050
+      },
+      "capabilities": [
+        {
+          "type": "AGENT_UPDATE"
+        }
+      ],
+      "domain": {
+        "fault_domain": {
+          "region": {
+            "name": "region-1"
+          },
+          "zone": {
+            "name": "zone-1"
+          }
+        }
+      },
+      "hostname": "172.17.8.101",
+      "id": "20151004-214809-1695027628-5050-12268",
+      "ip": 2198274058,
+      "pid": "master@172.17.8.101:5050",
+      "port": 5050,
+      "version": "0.23.0"
+    }
+  },
+  "type": "GET_MASTER"
+}