Merge pull request EnMasseProject#16 from k-wall/address-addressspace-status-phase

Expose AddressSpace and Address Status Phase

Author: riccardo-forina

console/console-init/ui/mock-console-server/README.md

@@ -81,6 +81,7 @@ query all_address_spaces {
         }
       }
       Status {
+        Phase
         IsReady
         Messages
       }
@@ -113,6 +114,7 @@ query all_addresses_for_addressspace_view {
       Status {
         IsReady
         Messages
+        Phase
         PlanStatus {
           Partitions
         }

console/console-init/ui/mock-console-server/mock-console-server.js

@@ -212,6 +212,15 @@ function createAddressSpace(as) {
     throw `Address space with name  '${as.ObjectMeta.Name} already exists in namespace ${as.ObjectMeta.Namespace}`;
   }
 
+  var phase = "Active";
+  var messages = [];
+  if (as.Status && as.Status.Phase) {
+    phase = as.Status.Phase
+  }
+  if (phase !== "Active") {
+    messages.push("The following deployments are not ready: [admin.daf7b31]")
+  }
+
   var addressSpace = {
     ObjectMeta: {
       Name: as.ObjectMeta.Name,
@@ -224,9 +233,9 @@ function createAddressSpace(as) {
       Type: as.Spec.Type
     },
     Status: {
-      "isReady": true,
-      "messages": [],
-      "phase": "Active"
+      IsReady: phase === "Active",
+      Messages: messages,
+      Phase: phase
     }
   };
 
@@ -304,6 +313,9 @@ createAddressSpace(
       Spec: {
         Plan: "standard-medium",
         Type: "standard"
+      },
+      Status: {
+        Phase: "Configuring"
       }
     });
 
@@ -435,6 +447,14 @@ function createAddress(addr) {
     throw `Address with name  '${addr.ObjectMeta.Name} already exists in address space ${addr.Spec.AddressSpace}`;
   }
 
+  var phase = "Active";
+  var messages = [];
+  if (addr.Status && addr.Status.Phase) {
+    phase = addr.Status.Phase
+  }
+  if (phase !== "Active") {
+    messages.push("Address " + addr.ObjectMeta.Name + " not found on qdrouterd")
+  }
   var address = {
     ObjectMeta: {
       Name: addr.ObjectMeta.Name,
@@ -449,7 +469,9 @@ function createAddress(addr) {
       Type: addr.Spec.Type
     },
     Status: {
-      Phase: "Active",
+      IsReady: "Active" === phase,
+      Messages: messages,
+      Phase: phase,
       PlanStatus: {
         Name: plan.ObjectMeta.Name,
         Partitions: 1
@@ -539,6 +561,9 @@ function closeConnection(objectmeta) {
         AddressSpace: addressSpaces[0].ObjectMeta.Name,
         Plan: "standard-small-queue",
         Type: "queue"
+      },
+      Status: {
+        Phase: n.startsWith("c") ? "Configuring" : (n.startsWith("p") ? "Pending" : "Active")
       }
     })));
 

console/console-init/ui/mock-console-server/schema.js

@@ -122,6 +122,7 @@ const typeDefs = gql`
     type AddressSpaceStatus_enmasse_io_v1beta1 {
         IsReady: Boolean!
         Messages: [String!]
+        Phase: String!
     }
 
     type AddressSpec_enmasse_io_v1beta1 {
@@ -135,6 +136,7 @@ const typeDefs = gql`
     type AddressStatus_enmasse_io_v1beta1 {
         IsReady: Boolean!
         Messages: [String!]
+        Phase: String!
         PlanStatus: AddressPlanStatus_enmasse_io_v1beta1
     }