fix Guid import

common/admin/mocha-libexec/internal/librarymanager/libraryparser/YAMLLibraryParser.py

@@ -1,5 +1,5 @@
 from .LibraryParser import LibraryParser
-from ..Guid import Guid
+from ..core.Guid import Guid
 from .MochaSyntaxError import MochaSyntaxError
 
 class YAMLLibraryParser (LibraryParser):

common/admin/mocha-libexec/internal/librarymanager/operations/AssignAttributeOperation.py

@@ -1,5 +1,5 @@
 from .StoredProcedureOperation import StoredProcedureOperation
-from ..Guid import Guid
+from ..core.Guid import Guid
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
 

common/admin/mocha-libexec/internal/librarymanager/operations/AssignRelationshipOperation.py

@@ -1,5 +1,5 @@
 from .StoredProcedureOperation import StoredProcedureOperation
-from ..Guid import Guid
+from ..core.Guid import Guid
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
 

common/admin/mocha-libexec/internal/librarymanager/operations/CreateClassOperation.py

@@ -1,7 +1,7 @@
 from .StoredProcedureOperation import StoredProcedureOperation
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
-from ..Guid import Guid
+from ..core.Guid import Guid
 
 class CreateClassOperation (StoredProcedureOperation):
 

common/admin/mocha-libexec/internal/librarymanager/operations/CreateInstanceOperation.py

@@ -1,5 +1,5 @@
 from .StoredProcedureOperation import StoredProcedureOperation
-from ..Guid import Guid
+from ..core.Guid import Guid
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
 

common/admin/mocha-libexec/internal/librarymanager/operations/PrepareInstanceOperation.py

@@ -1,5 +1,5 @@
 from .StoredProcedureOperation import StoredProcedureOperation
-from ..Guid import Guid
+from ..core.Guid import Guid
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
 

common/admin/mocha-libexec/internal/librarymanager/operations/StoredProcedureOperation.py

@@ -5,7 +5,7 @@ from MySQLdb.connections import Connection
 from ..SQLExpression import SQLExpression
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
-from ..Guid import Guid
+from ..core.Guid import Guid
 
 class StoredProcedureOperation (LibraryOperation):
 	def get_sp_name(self):

common/admin/vagrant/templates/default/default.Vagrantfile

@@ -15,7 +15,7 @@ Vagrant.configure("2") do |config|
     # Every Vagrant development environment requires a box. You can search for
     # boxes at https://vagrantcloud.com/search.
     # box.vm.box = "mocha/lunar64"
-    box.vm.box = "ubuntu/lunar64"
+    box.vm.box = "ubuntu/mantic64"
     #box.vm.box = "default.box"
     
     box.vm.hostname = "@@MOCHA_SUV_ID@@.privatesuv.com"
@@ -116,8 +116,8 @@ Vagrant.configure("2") do |config|
     WEBMASTER_PASS="Solty/AyanamiREI^^96274"
     ZQADMIN_PASS="Solty/AyanamiREI^^96274"
 
-    useradd -G webmasters -p "$(openssl passwd -6 $WEBMASTER_PASS)" webmaster
-    useradd -G zqadmin -p "$(openssl passwd -6 $ZQADMIN_PASS)" zqadmin
+    useradd -g webmasters -p "$(openssl passwd -6 $WEBMASTER_PASS)" webmaster
+    useradd -g zqadmin -p "$(openssl passwd -6 $ZQADMIN_PASS)" zqadmin
 
     echo "pending:building:5/27:import machine template" > /etc/mocha/suvstatus
     SHELL

python/mocha/lib/operations/CreateClassOperation.py

@@ -1,7 +1,7 @@
 from .StoredProcedureOperation import StoredProcedureOperation
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall
-from ..Guid import Guid
+from ..core.Guid import Guid
 
 class CreateClassOperation (StoredProcedureOperation):
 

python/mocha/lib/operations/CreateInstanceOperation.py

@@ -1,5 +1,5 @@
 from .StoredProcedureOperation import StoredProcedureOperation
-from ..Guid import Guid
+from ..core.Guid import Guid
 from ..SQLParameter import SQLParameter
 from ..SQLFunctionCall import SQLFunctionCall