Merge changes from ip-billing-dev branch.

[moira.git] / include / moira_site.h

diff --git a/include/moira_site.h b/include/moira_site.h
index e918ecfff01d6ea07f6321dcfd100ae84a44ecff..142f7b1a59a6a9f8469016a473cb98428d1bb1a8 100644 (file)
--- a/include/moira_site.h
+++ b/include/moira_site.h
@@ -165,22 +165,23 @@
 #define M_LOC          4
 #define M_CONTACT      5
 #define M_BILL_CONTACT  6
-#define M_USE          7
-#define M_STAT         8
-#define M_STAT_CHNG    9
-#define M_SUBNET       10
-#define M_ADDR         11
-#define M_OWNER_TYPE   12
-#define M_OWNER_NAME   13
-#define M_ACOMMENT     14
-#define M_OCOMMENT     15
-#define M_CREATED      16
-#define M_CREATOR      17
-#define M_INUSE                18
-#define M_MODTIME      19
-#define M_MODBY                20
-#define M_MODWITH      21
-#define M_END          22
+#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 */
 
@@ -328,17 +329,27 @@
 
 #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         2
+#define SNET_STATUS_RESNET          3
+#define SNET_STATUS_INFRASTRUCTURE  4
 
 /* User Information queries, v3 */