1 files changed, 0 insertions, 534 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-instance.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-instance.json
deleted file mode 100644
index 28f505e88ec..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/testdata/complete-instance.json
+++ /dev/null
@@ -1,534 +0,0 @@
-{
-  "id": "tenant1:app1:default",
-  "deploymentSpecField": "<deployment version='1.0'>\n  <test />\n  <!--<staging />-->\n  <prod global-service-id=\"foo\">\n    <region active=\"true\">us-east-3</region>\n    <region active=\"true\">us-west-1</region>\n  </prod>\n</deployment>\n",
-  "validationOverrides": "<validation-overrides>\n    <allow until=\"2016-04-28\" comment=\"Renaming content cluster\">content-cluster-removal</allow>\n    <allow until=\"2016-08-22\" comment=\"Migrating us-east-3 to C-2E\">cluster-size-reduction</allow>\n    <allow until=\"2017-06-30\" comment=\"Test Vespa upgrade tests\">force-automatic-tenant-upgrade-test</allow>\n</validation-overrides>\n",
-  "deployments": [
-    {
-      "zone": {
-        "environment": "prod",
-        "region": "us-west-1"
-      },
-      "version": "6.173.62",
-      "deployTime": 1510837817704,
-      "applicationPackageRevision": {
-        "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-        "sourceRevision": {
-          "repositoryField": "git@git.host:user/repo.git",
-          "branchField": "origin/master",
-          "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-        }
-      },
-      "clusterInfo": {
-        "cluster1": {
-          "flavor": "d-3-16-100",
-          "cost": 9,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "container",
-          "hostnames": [
-            "node1",
-            "node2"
-          ]
-        },
-        "cluster2": {
-          "flavor": "d-12-64-400",
-          "cost": 38,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "content",
-          "hostnames": [
-            "node3",
-            "node4",
-            "node5"
-          ]
-        },
-        "cluster3": {
-          "flavor": "d-12-64-400",
-          "cost": 38,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "content",
-          "hostnames": [
-            "node6",
-            "node7",
-            "node8",
-            "node9"
-          ]
-        }
-      },
-      "clusterUtils": {
-        "cluster1": {
-          "cpu": 0.1720353499228221,
-          "mem": 0.4986146831512451,
-          "disk": 0.0617671330041831,
-          "diskbusy": 0
-        },
-        "cluster2": {
-          "cpu": 0.07505730001866318,
-          "mem": 0.7936344432830811,
-          "disk": 0.2260549694485994,
-          "diskbusy": 0
-        },
-        "cluster3": {
-          "cpu": 0.01712671480989384,
-          "mem": 0.0225852754983035,
-          "disk": 0.006084436856721915,
-          "diskbusy": 0
-        }
-      },
-      "metrics": {
-        "queriesPerSecond": 1.25,
-        "writesPerSecond": 43.83199977874756,
-        "documentCount": 525880277.9999999,
-        "queryLatencyMillis": 5.607503938674927,
-        "writeLatencyMillis": 20.57866265104621
-      }
-    },
-    {
-      "zone": {
-        "environment": "test",
-        "region": "us-east-1"
-      },
-      "version": "6.173.62",
-      "deployTime": 1511256872316,
-      "applicationPackageRevision": {
-        "applicationPackageHash": "ec548fa61cbfab7a270a51d46b1263ec1be5d9a8",
-        "sourceRevision": {
-          "repositoryField": "git@git.host:user/repo.git",
-          "branchField": "origin/master",
-          "commitField": "234f3e4e77049d0b9538c9e1b356d17eb1dedb6a"
-        }
-      },
-      "clusterInfo": {},
-      "clusterUtils": {},
-      "metrics": {
-        "queriesPerSecond": 0,
-        "writesPerSecond": 0,
-        "documentCount": 0,
-        "queryLatencyMillis": 0,
-        "writeLatencyMillis": 0
-      }
-    },
-    {
-      "zone": {
-        "environment": "dev",
-        "region": "us-east-1"
-      },
-      "version": "6.173.62",
-      "deployTime": 1510597489464,
-      "applicationPackageRevision": {
-        "applicationPackageHash": "59b883f263c2a3c23dfab249730097d7e0e1ed32"
-      },
-      "clusterInfo": {
-        "cluster1": {
-          "flavor": "d-2-8-50",
-          "cost": 5,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "container",
-          "hostnames": [
-            "node1"
-          ]
-        },
-        "cluster2": {
-          "flavor": "d-2-8-50",
-          "cost": 5,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "content",
-          "hostnames": [
-            "node2"
-          ]
-        },
-        "cluster3": {
-          "flavor": "d-2-8-50",
-          "cost": 5,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "content",
-          "hostnames": [
-            "node3"
-          ]
-        }
-      },
-      "clusterUtils": {
-        "cluster1": {
-          "cpu": 0.191833330678661,
-          "mem": 0.4625738318415235,
-          "disk": 0.05582004563850269,
-          "diskbusy": 0
-        },
-        "cluster2": {
-          "cpu": 0.2227037978608054,
-          "mem": 0.2051752598416401,
-          "disk": 0.05471533698695047,
-          "diskbusy": 0
-        },
-        "cluster3": {
-          "cpu": 0.1869410834020498,
-          "mem": 0.1691722576000564,
-          "disk": 0.04977374774258153,
-          "diskbusy": 0
-        }
-      },
-      "metrics": {
-        "queriesPerSecond": 0,
-        "writesPerSecond": 0,
-        "documentCount": 30916,
-        "queryLatencyMillis": 0,
-        "writeLatencyMillis": 0
-      }
-    },
-    {
-      "zone": {
-        "environment": "prod",
-        "region": "us-east-3"
-      },
-      "version": "6.173.62",
-      "deployTime": 1510817190016,
-      "applicationPackageRevision": {
-        "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-        "sourceRevision": {
-          "repositoryField": "git@git.host:user/repo.git",
-          "branchField": "origin/master",
-          "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-        }
-      },
-      "clusterInfo": {
-        "cluster1": {
-          "flavor": "d-3-16-100",
-          "cost": 9,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "container",
-          "hostnames": [
-            "node1",
-            "node2"
-          ]
-        },
-        "cluster2": {
-          "flavor": "d-12-64-400",
-          "cost": 38,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "content",
-          "hostnames": [
-            "node1",
-            "node2",
-            "node3"
-          ]
-        },
-        "cluster3": {
-          "flavor": "d-12-64-400",
-          "cost": 38,
-          "flavorCpu": 0,
-          "flavorMem": 0,
-          "flavorDisk": 0,
-          "clusterType": "content",
-          "hostnames": [
-            "node1",
-            "node2",
-            "node3",
-            "node4"
-          ]
-        }
-      },
-      "clusterUtils": {
-        "cluster1": {
-          "cpu": 0.2295038983007097,
-          "mem": 0.4627357390237263,
-          "disk": 0.05559941525894966,
-          "diskbusy": 0
-        },
-        "cluster2": {
-          "cpu": 0.05340429087579549,
-          "mem": 0.8107630891552372,
-          "disk": 0.226444914138854,
-          "diskbusy": 0
-        },
-        "cluster3": {
-          "cpu": 0.02148227413975218,
-          "mem": 0.02162174219104161,
-          "disk": 0.006057760545243265,
-          "diskbusy": 0
-        }
-      },
-      "metrics": {
-        "queriesPerSecond": 1.734000012278557,
-        "writesPerSecond": 44.59999895095825,
-        "documentCount": 525868193.9999999,
-        "queryLatencyMillis": 5.65284947195106,
-        "writeLatencyMillis": 17.34593812832452
-      }
-    }
-  ],
-  "deploymentJobs": {
-    "projectId": 102889,
-    "jobStatus": [
-      {
-        "jobType": "staging-test",
-        "lastTriggered": {
-          "id": -1,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "system-test completed",
-          "at": 1510830134259
-        },
-        "lastCompleted": {
-          "id": 1184,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "system-test completed",
-          "at": 1510830684960
-        },
-        "lastSuccess": {
-          "id": 1184,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "system-test completed",
-          "at": 1510830684960
-        }
-      },
-      {
-        "jobType": "component",
-        "lastCompleted": {
-          "id": 849,
-          "version": "6.174.156",
-          "upgrade": false,
-          "reason": "Application commit",
-          "at": 1511217733555
-        },
-        "lastSuccess": {
-          "id": 849,
-          "version": "6.174.156",
-          "upgrade": false,
-          "reason": "Application commit",
-          "at": 1511217733555
-        }
-      },
-      {
-        "jobType": "production-us-east-3",
-        "lastTriggered": {
-          "id": -1,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "staging-test completed",
-          "at": 1510830685127
-        },
-        "lastCompleted": {
-          "id": 923,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "staging-test completed",
-          "at": 1510837650046
-        },
-        "lastSuccess": {
-          "id": 923,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "staging-test completed",
-          "at": 1510837650046
-        }
-      },
-      {
-        "jobType": "production-us-west-1",
-        "lastTriggered": {
-          "id": -1,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "production-us-east-3 completed",
-          "at": 1510837650139
-        },
-        "lastCompleted": {
-          "id": 646,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "production-us-east-3 completed",
-          "at": 1510843559162
-        },
-        "lastSuccess": {
-          "id": 646,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "production-us-east-3 completed",
-          "at": 1510843559162
-        }
-      },
-      {
-        "jobType": "system-test",
-        "jobError": "unknown",
-        "lastTriggered": {
-          "id": -1,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "ec548fa61cbfab7a270a51d46b1263ec1be5d9a8",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "234f3e4e77049d0b9538c9e1b356d17eb1dedb6a"
-            }
-          },
-          "upgrade": false,
-          "reason": "Available change in component",
-          "at": 1511256608649
-        },
-        "lastCompleted": {
-          "id": 1686,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "ec548fa61cbfab7a270a51d46b1263ec1be5d9a8",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "234f3e4e77049d0b9538c9e1b356d17eb1dedb6a"
-            }
-          },
-          "upgrade": false,
-          "reason": "Available change in component",
-          "at": 1511256603353
-        },
-        "firstFailing": {
-          "id": 1659,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "ec548fa61cbfab7a270a51d46b1263ec1be5d9a8",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "234f3e4e77049d0b9538c9e1b356d17eb1dedb6a"
-            }
-          },
-          "upgrade": false,
-          "reason": "component completed",
-          "at": 1511219070725
-        },
-        "lastSuccess": {
-          "id": 1658,
-          "version": "6.173.62",
-          "revision": {
-            "applicationPackageHash": "9db423e1021d7b452d37ec6372bc757d9c1bda87",
-            "sourceRevision": {
-              "repositoryField": "git@git.host:user/repo.git",
-              "branchField": "origin/master",
-              "commitField": "49cd7bbb1ed9f4b922083cb042590b0885ffe22b"
-            }
-          },
-          "upgrade": true,
-          "reason": "Upgrading to 6.173.62",
-          "at": 1511175754163
-        }
-      }
-    ]
-  },
-  "deployingField": {
-    "buildNumber": 42,
-    "sourceRevision": {
-      "repositoryField": "git@git.host:user/repo.git",
-      "branchField": "origin/master",
-      "commitField": "234f3e4e77049d0b9538c9e1b356d17eb1dedb6a"
-    }
-  },
-  "outstandingChangeField": false,
-  "queryQuality": 100,
-  "writeQuality": 99.99894341115082,
-  "pemDeployKey": "-----BEGIN PUBLIC KEY-----\n∠( ᐛ 」∠)＿\n-----END PUBLIC KEY-----",
-  "assignedRotations": [
-    {
-      "rotationId": "rotation-foo",
-      "clusterId": "qrs",
-      "endpointId": "default"
-    }
-  ],
-  "rotationStatus2": [
-    {
-      "rotationId": "rotation-foo",
-      "status": [
-        {
-          "environment": "prod",
-          "region": "us-east-3",
-          "state": "in"
-        }
-      ]
-    }
-  ]
-}