sync back-end

eucalyptus · Jan 31, 2011 · 4a3d9eb · 4a3d9eb
1 parent 0afb635
commit 4a3d9eb
Show file tree

Hide file tree

Showing 71 changed files with 5,847 additions and 626 deletions.
diff --git a/Makefile b/Makefile
@@ -50,6 +50,7 @@ install: deploy
 	@$(INSTALL) -d $(DESTDIR)$(vardir)/lib/eucalyptus/CC
 	@$(INSTALL) -d $(DESTDIR)$(vardir)/log/eucalyptus
 	@$(INSTALL) -d $(DESTDIR)$(datarootdir)/eucalyptus
+	@$(INSTALL) -d $(DESTDIR)$(datarootdir)/eucalyptus/doc
 	@$(INSTALL) -d $(DESTDIR)$(usrdir)/sbin
 	@$(INSTALL) -d $(DESTDIR)$(usrdir)/lib/eucalyptus
 	@$(INSTALL) -d $(DESTDIR)$(etcdir)/bash_completion.d

diff --git a/cluster/CCclient.c b/cluster/CCclient.c
@@ -52,7 +52,7 @@ permission notice:
   SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
   IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
   BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
-  THE REGENTS’ DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
+  THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
   OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
   WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
   ANY SUCH LICENSES OR RIGHTS.
@@ -190,6 +190,45 @@ int main(int argc, char **argv) {
 	printf("cc_describeInstances() failed\n");
 	exit(1);
       }
+    } else if (!strcmp(argv[2], "describeServices")) {
+      rc = cc_describeServices(env, stub);
+      if (rc != 0) {
+	printf("cc_describeServices() failed\n");
+	exit(1);
+      }
+    } else if (!strcmp(argv[2], "startService")) {
+      rc = cc_startService(env, stub);
+      if (rc != 0) {
+	printf("cc_startService() failed\n");
+	exit(1);
+      }
+    } else if (!strcmp(argv[2], "stopService")) {
+      rc = cc_stopService(env, stub);
+      if (rc != 0) {
+	printf("cc_stopService() failed\n");
+	exit(1);
+      }
+    } else if (!strcmp(argv[2], "enableService")) {
+      rc = cc_enableService(env, stub);
+      if (rc != 0) {
+	printf("cc_enableService() failed\n");
+	exit(1);
+      }
+    } else if (!strcmp(argv[2], "disableService")) {
+      rc = cc_disableService(env, stub);
+      if (rc != 0) {
+	printf("cc_disableService() failed\n");
+	exit(1);
+      }
+    } else if (!strcmp(argv[2], "describeBundleTasks")) {
+      char **meh;
+      meh = argv;
+      meh++; meh++; meh++;
+      rc = cc_describeBundleTasks(meh, 1, env, stub);
+      if (rc != 0) {
+	printf("cc_describeBundleTasks() failed\n");
+	exit(1);
+      }
     } else if (!strcmp(argv[2], "getConsoleOutput")) {
       rc = cc_getConsoleOutput(argv[3], env, stub);
       if (rc != 0) {
@@ -298,6 +337,12 @@ int main(int argc, char **argv) {
 	printf("cc_unassignNetwork() failed\n");
 	exit(1);
       }
+    } else if (!strcmp(argv[2], "bundleInstance")) {
+      rc = cc_bundleInstance(argv[3], argv[4], argv[5], argv[6], argv[7], env, stub);
+      if (rc != 0) {
+	printf("cc_bundleInstance() failed\n");
+	exit(1);
+      }
     } else if (!strcmp(argv[2], "createImage")) {
       rc = cc_createImage(argv[3], argv[4], argv[5], env, stub);
       if (rc != 0) {

diff --git a/cluster/Makefile b/cluster/Makefile
@@ -14,7 +14,7 @@ CLIENT=CCclient
 CLIENTKILLALL=euca_killall
 #WSDL2C=${AXIS2C_HOME}/bin/tools/wsdl2c/WSDL2C.sh
 NCLIBS=../util/data.o ../node/client-marshal-adb.o ../util/ipc.o
-SCLIBS=../storage/storage.o ../storage/walrus.o
+SCLIBS=../storage/storage.o ../storage/storage-windows.o ../storage/walrus.o
 VNLIBS=../net/vnetwork.o ../util/misc.o
 WSSECLIBS=../util/euca_axis.o ../util/euca_auth.o
 CC_LIBS 	= ${LIBS} -lcurl
@@ -44,15 +44,15 @@ generated/stubs: $(CCWSDL) $(NCWSDL)
 
 server: $(SERVICE_SO)
 
-$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o server-marshal-state.o handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so 
-	$(CC) -shared generated/*.o server-marshal.o server-marshal-state.o handlers.o handlers-state.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
+$(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o $(AXIS2C_HOME)/lib/libaxutil.so ../util/windows-bundle.o
+	$(CC) -shared generated/*.o server-marshal.o handlers.o handlers-state.o server-marshal-state.o  ../util/windows-bundle.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
 
 client: $(CLIENT)_full $(CLIENTKILLALL)
 
-$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so
 	$(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
 
-$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
+$(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o handlers-state.o $(AXIS2C_HOME)/lib/libaxutil.so
 	$(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
 
 deploy: