New status for GigE private subnets.

[moira.git] / include / moira_site.h

diff --git a/include/moira_site.h b/include/moira_site.h
index 51cd08f7168e1bf9a2fee71a391a1560e1e19fee..f368313a0fed37ee237cbedd8e986cec471e93df 100644 (file)
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -125,7 +125,7 @@
 #define KMAP_PRINCIPAL 1
 #define KMAP_END       2
 
-/* General List information Queries, v3. */
+/* General List information Queries, v4. */
 
 #define L_NAME     0
 #define L_ACTIVE   1
@@ -137,11 +137,13 @@
 #define L_NFSGROUP 7
 #define L_ACE_TYPE 8
 #define L_ACE_NAME 9
-#define L_DESC     10
-#define L_MODTIME  11
-#define L_MODBY    12
-#define L_MODWITH  13
-#define L_END      14
+#define L_MEMACE_TYPE 10
+#define L_MEMACE_NAME 11
+#define L_DESC     12
+#define L_MODTIME  13
+#define L_MODBY    14
+#define L_MODWITH  15
+#define L_END      16
 
 /* List Member information queries. */
 
@@ -162,22 +164,24 @@
 #define M_OS           3
 #define M_LOC          4
 #define M_CONTACT      5
-#define M_USE          6
-#define M_STAT         7
-#define M_STAT_CHNG    8
-#define M_SUBNET       9
-#define M_ADDR         10
-#define M_OWNER_TYPE   11
-#define M_OWNER_NAME   12
-#define M_ACOMMENT     13
-#define M_OCOMMENT     14
-#define M_CREATED      15
-#define M_CREATOR      16
-#define M_INUSE                17
-#define M_MODTIME      18
-#define M_MODBY                19
-#define M_MODWITH      20
-#define M_END          21
+#define M_BILL_CONTACT  6
+#define M_ACCT_NUMBER   7
+#define M_USE          8
+#define M_STAT         9
+#define M_STAT_CHNG    10
+#define M_SUBNET       11
+#define M_ADDR         12
+#define M_OWNER_TYPE   13
+#define M_OWNER_NAME   14
+#define M_ACOMMENT     15
+#define M_OCOMMENT     16
+#define M_CREATED      17
+#define M_CREATOR      18
+#define M_INUSE                19
+#define M_MODTIME      20
+#define M_MODBY                21
+#define M_MODWITH      22
+#define M_END          23
 
 /*  Machine to Cluster mapping */
 
@@ -325,17 +329,30 @@
 
 #define SN_NAME                0
 #define SN_DESC                1
-#define SN_ADDRESS     2
-#define SN_MASK                3
-#define SN_LOW         4
-#define SN_HIGH                5
-#define SN_PREFIX      6
-#define SN_ACE_TYPE    7
-#define SN_ACE_NAME    8
-#define SN_MODTIME     9
-#define SN_MODBY       10
-#define SN_MODWITH     11
-#define SN_END         12
+#define SN_STATUS       2
+#define SN_CONTACT      3
+#define SN_ACCT_NUMBER  4
+#define SN_ADDRESS     5
+#define SN_MASK                6
+#define SN_LOW         7
+#define SN_HIGH                8
+#define SN_PREFIX      9
+#define SN_ACE_TYPE    10
+#define SN_ACE_NAME    11
+#define SN_MODTIME     12
+#define SN_MODBY       13
+#define SN_MODWITH     14
+#define SN_END         15
+
+/* Subnet statuses */
+#define SNET_STATUS_RESERVED         0
+#define SNET_STATUS_BILLABLE         1
+#define SNET_STATUS_PRIVATE_10MBPS   2
+#define SNET_STATUS_PRIVATE_100MBPS  3
+#define SNET_STATUS_PRIVATE_OTHER    4
+#define SNET_STATUS_RESNET           5
+#define SNET_STATUS_INFRASTRUCTURE   6
+#define SNET_STATUS_PRIVATE_1000MBPS 7
 
 /* User Information queries, v3 */
 
@@ -355,7 +372,9 @@
 #define U_MODTIME 13
 #define U_MODBY   14
 #define U_MODWITH 15
-#define U_END     16
+#define U_CREATED 16
+#define U_CREATOR 17
+#define U_END     18
 
 /* User states (the value of argv[U_STATE] from a user query) */
 
@@ -386,12 +405,27 @@
 #define        ZA_IWS_ID       6
 #define        ZA_IUI_TYPE     7
 #define        ZA_IUI_ID       8
-#define        ZA_MODTIME      9
-#define        ZA_MODBY        10
-#define        ZA_MODWITH      11
-#define ZA_END         12
-
-
+#define ZA_OWNER_TYPE   9
+#define ZA_OWNER_ID     10
+#define        ZA_MODTIME      11
+#define        ZA_MODBY        12
+#define        ZA_MODWITH      13
+#define ZA_END         14
+
+/* Container queries */
+
+#define CON_NAME        0
+#define CON_DESCRIPT    1
+#define CON_LOCATION    2
+#define CON_CONTACT     3
+#define CON_OWNER_TYPE  4
+#define CON_OWNER_NAME  5
+#define CON_MEMACE_TYPE 6
+#define CON_MEMACE_NAME 7
+#define CON_MODTIME     8
+#define CON_MODBY       9
+#define CON_MODWITH     10
+#define CON_END         11
 
 /* Directories & files used on the server machine: */