- fix kamctl for cr after table changes for 1.5.x, bug #2794168

  (committed to trunk, because scripts are not yet ported to sr) 


git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5844 689a6050-402a-0410-94f2-e92a70836424

tools/kamctl

@@ -1245,8 +1245,11 @@ cr() {
 	require_ctlengine
 	case $1 in
 		show)
-			mecho "cr routing tree"
-			QUERY="select * FROM $ROUTE_TREE_TABLE ORDER BY $CARRIERROUTE_ROUTE_TREE_PREFIX_COLUMN; "
+			mecho "cr carrier names"
+			QUERY="select * FROM $CARRIER_NAME_TABLE ORDER BY $CARRIERROUTE_CARRIER_NAME_ID_COLUMN; "
+			$DBROCMD "$QUERY"
+			mecho "cr domain names"
+			QUERY="select * FROM $DOMAIN_NAME_TABLE ORDER BY $CARRIERROUTE_DOMAIN_NAME_ID_COLUMN; "
 			$DBROCMD "$QUERY"
 			mecho "cr routes"
 			QUERY="select * FROM $CARRIERROUTE_TABLE ORDER BY \
@@ -1264,15 +1267,48 @@ cr() {
 			$CTLCMD cr_dump
 			;;
 
-		addrt)
+		addcn)
+			shift
+			if [ $# -ne 2 ] ; then
+				merr "cr - missing carrier id or name"
+				exit 1
+			fi
+			QUERY="insert into $CARRIER_NAME_TABLE
+				( $CARRIERROUTE_CARRIER_NAME_ID_COLUMN, \
+				$CARRIERROUTE_CARRIER_NAME_CARRIER_COLUMN) \
+				VALUES ($1, '$2');"
+			$DBCMD "$QUERY"
+			if [ $? -ne 0 ] ; then
+				merr "cr - SQL Error"
+				exit 1
+			fi
+			minfo "execute '$0 cr reload' to synchronize cache and database"
+			;;
+
+		rmcn)
+			shift
+			if [ $# -ne 1 ] ; then
+				merr "cr - missing carrier id to be removed"
+				exit 1
+			fi
+			QUERY="delete from $CARRIER_NAME_TABLE where $CARRIERROUTE_CARRIER_NAME_ID_COLUMN='$1';"
+			$DBCMD "$QUERY"
+			if [ $? -ne 0 ] ; then
+				merr "cr - SQL Error"
+				exit 1 
+			fi
+			minfo "execute '$0 cr reload' to synchronize cache and database"
+			;;
+
+		adddn)
 			shift
 			if [ $# -ne 2 ] ; then
-				merr "cr - missing route_tree"
+				merr "cr - missing domain id or name"
 				exit 1
 			fi
-			QUERY="insert into $ROUTE_TREE_TABLE
-				( $CARRIERROUTE_ROUTE_TREE_PREFIX_COLUMN, \
-				$CARRIERROUTE_ROUTE_TREE_CARRIER_COLUMN) \
+			QUERY="insert into $DOMAIN_NAME_TABLE
+				( $CARRIERROUTE_DOMAIN_NAME_ID_COLUMN, \
+				$CARRIERROUTE_DOMAIN_NAME_DOMAIN_COLUMN) \
 				VALUES ($1, '$2');"
 			$DBCMD "$QUERY"
 			if [ $? -ne 0 ] ; then
@@ -1282,13 +1318,13 @@ cr() {
 			minfo "execute '$0 cr reload' to synchronize cache and database"
 			;;
 
-		rmrt)
+		rmdn)
 			shift
 			if [ $# -ne 1 ] ; then
-				merr "cr - missing route_tree to be removed"
+				merr "cr - missing domain id to be removed"
 				exit 1
 			fi
-			QUERY="delete from $ROUTE_TREE_TABLE where $CARRIERROUTE_ROUTE_TREE_CARRIER_COLUMN='$1';"
+			QUERY="delete from $DOMAIN_NAME_TABLE where $CARRIERROUTE_DOMAIN_NAME_ID_COLUMN='$1';"
 			$DBCMD "$QUERY"
 			if [ $? -ne 0 ] ; then
 				merr "cr - SQL Error"

tools/kamctl.base

@@ -211,12 +211,19 @@ LCR_GW_FLAGS_COLUMN=flags
 LCR_GW_WEIGHT_COLUMN=weight
 LCR_GW_PING_COLUMN=ping
 
-# route_tree table
-if [ -z "$ROUTE_TREE_TABLE" ] ; then
-	ROUTE_TREE_TABLE=route_tree
+# carrier_name table
+if [ -z "$CARRIER_NAME_TABLE" ] ; then
+	CARRIER_NAME_TABLE=carrier_name
 fi
-CARRIERROUTE_ROUTE_TREE_PREFIX_COLUMN=id
-CARRIERROUTE_ROUTE_TREE_CARRIER_COLUMN=carrier
+CARRIERROUTE_CARRIER_NAME_ID_COLUMN=id
+CARRIERROUTE_CARRIER_NAME_CARRIER_COLUMN=carrier
+
+# domain_name table
+if [ -z "$DOMAIN_NAME_TABLE" ] ; then
+	DOMAIN_NAME_TABLE=domain_name
+fi
+CARRIERROUTE_DOMAIN_NAME_ID_COLUMN=id
+CARRIERROUTE_DOMAIN_NAME_DOMAIN_COLUMN=domain
 
 # carrierroute table
 if [ -z "$CARRIERROUTE_TABLE" ] ; then
@@ -384,8 +391,10 @@ cat <<EOF
  cr show ....................................................... show tables
  cr reload ..................................................... reload tables
  cr dump ....................................................... show in memory tables
- cr addrt <routing_tree_id> <routing_tree> ..................... add a tree
- cr rmrt  <routing_tree> ....................................... rm a tree
+ cr addcn <carrier id> <carrier name> .......................... add a carrier name
+ cr rmcn  <carrier id> ......................................... rm a carrier name
+ cr adddn <domain id> <domain name> ............................ add a domain name
+ cr rmdn  <domain id> .......................................... rm a domain name
  cr addcarrier <carrier> <scan_prefix> <domain> <rewrite_host> ................
                <prob> <strip> <rewrite_prefix> <rewrite_suffix> ...............
                <flags> <mask> <comment> .........................add a carrier