Permalink
Browse files

Merge remote branch 'upstream/master' into spotinstances

Conflicts:
	service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
  • Loading branch information...
2 parents 0b7b371 + 826a426 commit c90e594dfa203775f8121c0792c06d93fce83694 @pauloricardomg pauloricardomg committed Jul 20, 2010
Showing with 3,673 additions and 5,605 deletions.
  1. +0 −34 .idea-modules/rest/rest.iml
  2. +6 −1 .idea/libraries/cloud_client_libs.xml
  3. +0 −1 .idea/modules.xml
  4. +2 −0 authzdb/build.xml
  5. +1 −2 authzdb/src/org/nimbus/authz/AuthzDBAdapter.java
  6. +14 −0 autoconfiguration/build.xml
  7. +0 −160 autoconfiguration/share/autoconfig-adjustments.sh
  8. +13 −244 autoconfiguration/share/autoconfig.sh
  9. +0 −9 autoconfiguration/share/lib/common-env.sh
  10. +0 −16 autoconfiguration/share/lib/network-template.txt
  11. +1 −1 cloud-client/builder/environment.sh
  12. +12 −0 cloud-client/nimbus-cloud-client-src/CHANGES.txt
  13. +44 −7 cloud-client/nimbus-cloud-client-src/README.txt
  14. +5 −1 cloud-client/nimbus-cloud-client-src/bin/cloud-client.sh
  15. +12 −0 control/bin/fakesudo
  16. +0 −7 control/etc/workspace-control/propagation.conf
  17. +0 −5 control/libexec/workspace-control/tmp-lease.sh
  18. +106 −0 control/src/propagate-only-mode.sh
  19. +1 −1 control/src/python/workspacecontrol/defaults/NetworkBootstrap.py
  20. +1 −21 control/src/python/workspacecontrol/defaults/imageprocurement/propagate_scp.py
  21. +11 −7 control/src/python/workspacecontrol/experimental/tmplease.py
  22. +18 −0 control/src/python/workspacecontrol/main/wc_core.py
  23. +1 −1 control/src/python/workspacecontrol/main/wc_core_creation.py
  24. +52 −0 control/src/python/workspacecontrol/main/wc_core_persistence.py
  25. +165 −0 control/src/python/workspacecontrol/mocks/DoNothingPlatform.py
  26. +1 −0 control/src/python/workspacecontrol/mocks/__init__.py
  27. +16 −0 ctx-broker/build.xml
  28. +2 −0 ctx-broker/wsdl/stubs/build.xml
  29. +1 −1 cumulus/authz/pynimbusauthz/__init__.py
  30. +5 −2 cumulus/cb/pycb/__init__.py
  31. +5 −0 cumulus/cb/pycb/cbRequest.py
  32. +4 −0 cumulus/cb/pycb/cumulus.py
  33. +5 −1 cumulus/cb/pycb/tools/base_repo.py
  34. +0 −1 cumulus/conf/Makefile.am
  35. +0 −1 cumulus/conf/Makefile.in
  36. +0 −23 cumulus/cumulus-install.sh
  37. +34 −38 cumulus/perf/run-many.sh
  38. +16 −0 cumulus/tests/client/buckets_test.py
  39. +2 −2 docs/scripts/local-serve.py
  40. +2 −2 docs/src/admin/index.html
  41. +0 −111 docs/src/admin/nimbus-build.txt
  42. +0 −49 docs/src/admin/overview.html
  43. +2 −1,224 docs/src/admin/quickstart.html
  44. +23 −5 docs/src/admin/reference.html
  45. +0 −27 docs/src/admin/test-create-output.txt
  46. +0 −12 docs/src/admin/test-create.sh
  47. +60 −3 docs/src/admin/troubleshooting.html
  48. +2 −2 docs/src/admin/upgrading.html
  49. +2 −2 docs/src/admin/z2c/final-tests.html
  50. +7 −3 docs/src/admin/z2c/index.html
  51. +11 −5 docs/src/admin/z2c/networking-setup.html
  52. +23 −20 docs/src/admin/z2c/service-dependencies.html
  53. +18 −25 docs/src/admin/z2c/service-setup.html
  54. +5 −5 docs/src/admin/z2c/ssh-setup.html
  55. +12 −7 docs/src/admin/z2c/vmm-setup.html
  56. +147 −3 docs/src/changelog.html
  57. +16 −0 docs/src/css/doc.css
  58. +1 −1 docs/src/dev/apis.html
  59. +2 −2 docs/src/dev/docs.html
  60. +2 −2 docs/src/dev/index.html
  61. +1 −1 docs/src/dev/meta.html
  62. +7 −7 docs/src/dev/reference.html
  63. +1 −1 docs/src/dev/sccs.html
  64. +155 −33 docs/src/elclients.html
  65. +24 −48 docs/src/faq.html
  66. +7 −9 docs/src/index.html
  67. +1 −1 docs/src/plugins/index.html
  68. +1 −1 docs/src/plugins/service-accounting.html
  69. +1 −1 docs/src/plugins/service-authz.html
  70. +1 −1 docs/src/plugins/service-network.html
  71. +1 −1 docs/src/plugins/service-prop.html
  72. +1 −1 docs/src/plugins/service-reqintake.html
  73. +1 −1 docs/src/plugins/service-sched.html
  74. +1 −1 docs/src/plugins/service-tasks.html
  75. +23 −22 docs/src/summary.html
  76. +2 −0 home/bin/nimbus-edit-user
  77. +2 −0 home/bin/nimbus-list-users
  78. +2 −0 home/bin/nimbus-new-user
  79. +2 −0 home/bin/nimbus-remove-user
  80. +18 −0 home/bin/nimbus-reset-state
  81. +10 −0 home/bin/nimbus-version
  82. +36 −21 home/libexec/nimbus_edit_user.py
  83. +9 −1 home/libexec/nimbus_list_users.py
  84. +57 −11 home/libexec/nimbus_new_user.py
  85. +4 −0 home/libexec/nimbus_remove_user.py
  86. +207 −0 home/libexec/nimbus_reset_state.py
  87. +371 −0 home/libexec/nimbus_version.py
  88. +30 −44 home/libexec/nimbusconfigure.py
  89. +1 −5 home/libexec/run-services.sh
  90. +3 −2 home/var/cloud.properties.in
  91. +14 −2 install
  92. BIN lib/clients/httpclient-4.1-alpha2.jar
  93. BIN lib/clients/httpcore-4.1-beta1.jar
  94. +202 −0 lib/licenses/bcver.LICENSE
  95. BIN lib/test/bcver.jar
  96. +10 −7 libexec/install-real.sh
  97. +2 −0 messaging/gt4.0-elastic/java/msgbridge/build.xml
  98. +0 −10 messaging/gt4.0-elastic/java/msgbridge/etc/elastic/elastic.conf
  99. +0 −6 messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/main.conflocator.xml
  100. +0 −12 messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/main.xml
  101. +38 −21 ...dge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/image/defaults/CumulusRepository.java
  102. +38 −12 ...ava/msgbridge/src/org/nimbustools/messaging/gt4_0_elastic/v2008_05_05/rm/defaults/DefaultRun.java
  103. +2 −0 messaging/gt4.0-elastic/java/stubs/build.xml
  104. +2 −0 messaging/gt4.0/java/common/build.xml
  105. +0 −3 messaging/gt4.0/java/gar-builder/build.properties
  106. +13 −7 messaging/gt4.0/java/gar-builder/build.xml
  107. +1 −8 messaging/gt4.0/java/gar-builder/etc/post-deploy.xml
  108. +2 −0 messaging/gt4.0/java/msgbridge/build.xml
  109. +2 −0 messaging/gt4.0/java/stubs/build.xml
  110. +2 −0 messaging/query/java/source/build.xml
  111. +2 −3 messaging/query/java/source/etc/query/query.conf
  112. +0 −20 messaging/rest/java/source/build.properties
  113. +0 −157 messaging/rest/java/source/build.xml
  114. +0 −77 messaging/rest/java/source/etc/rest/other/main-fake.xml
  115. +0 −28 messaging/rest/java/source/etc/rest/other/main.conflocator.xml
  116. +0 −86 messaging/rest/java/source/etc/rest/other/main.xml
  117. +0 −12 messaging/rest/java/source/etc/rest/rest.conf
  118. +0 −70 messaging/rest/java/source/src/org/nimbustools/messaging/rest/AdminResource.java
  119. +0 −30 messaging/rest/java/source/src/org/nimbustools/messaging/rest/DuplicateUserException.java
  120. +0 −89 messaging/rest/java/source/src/org/nimbustools/messaging/rest/FakeUsersService.java
  121. +0 −421 messaging/rest/java/source/src/org/nimbustools/messaging/rest/GridmapUsersService.java
  122. +0 −60 messaging/rest/java/source/src/org/nimbustools/messaging/rest/NimbusWebException.java
  123. +0 −67 messaging/rest/java/source/src/org/nimbustools/messaging/rest/NimbusWebExceptionMapper.java
  124. +0 −147 messaging/rest/java/source/src/org/nimbustools/messaging/rest/OutFaultInterceptor.java
  125. +0 −126 messaging/rest/java/source/src/org/nimbustools/messaging/rest/ResponseUtil.java
  126. +0 −173 messaging/rest/java/source/src/org/nimbustools/messaging/rest/RestHttp.java
  127. +0 −29 messaging/rest/java/source/src/org/nimbustools/messaging/rest/UnknownKeyException.java
  128. +0 −29 messaging/rest/java/source/src/org/nimbustools/messaging/rest/UnknownUserException.java
  129. +0 −155 messaging/rest/java/source/src/org/nimbustools/messaging/rest/UsersResource.java
  130. +0 −62 messaging/rest/java/source/src/org/nimbustools/messaging/rest/UsersService.java
  131. +0 −57 messaging/rest/java/source/src/org/nimbustools/messaging/rest/repr/AccessKey.java
  132. +0 −38 messaging/rest/java/source/src/org/nimbustools/messaging/rest/repr/ErrorMessage.java
  133. +0 −58 messaging/rest/java/source/src/org/nimbustools/messaging/rest/repr/User.java
  134. +2 −0 metadata/java/source/build.xml
  135. +32 −0 scripts/check-jars.sh
  136. +14 −0 scripts/jars-build-and-install.sh
  137. +17 −7 scripts/lib/gt4.0/build/build.xml
  138. +1 −1 scripts/lib/gt4.0/dist/build.properties
  139. +90 −0 scripts/lib/web_ball.py
  140. +70 −0 scripts/make-dist-remote.sh
  141. +65 −3 scripts/make-dist.sh
  142. +2 −0 service-api/java/source/build.xml
  143. +14 −0 service/client/java/source/build.xml
  144. +7 −0 service/client/java/source/src/org/globus/workspace/client_common/TempBaseClient.java
  145. +101 −0 service/client/java/source/src/org/globus/workspace/client_core/utils/NimbusCredential.java
  146. +89 −0 service/client/java/source/src/org/globus/workspace/cloud/client/AllArgs.java
  147. +29 −33 service/client/java/source/src/org/globus/workspace/cloud/client/CloudClient.java
  148. +15 −0 service/client/java/source/src/org/globus/workspace/cloud/client/Props.java
  149. +7 −0 service/client/java/source/src/org/globus/workspace/cloud/client/StubConf.java
  150. +7 −22 service/client/java/source/src/org/globus/workspace/cloud/client/security/SecurityPrinter.java
  151. +172 −17 service/client/java/source/src/org/globus/workspace/cloud/client/util/CloudClientUtil.java
  152. +24 −2 service/client/java/source/src/org/globus/workspace/cloud/client/util/CumulusRepositoryUtil.java
  153. +243 −20 service/client/java/source/src/org/globus/workspace/cloud/client/util/CumulusTask.java
  154. +2 −2 service/client/java/source/src/org/globus/workspace/cloud/client/util/GridFTPRepositoryUtil.java
  155. +8 −8 service/client/java/source/src/org/globus/workspace/cloud/meta/client/Cloud.java
  156. +2 −0 service/service/java/source/build.xml
  157. +14 −2 service/service/java/source/etc/workspace-service/global-policies.conf
  158. +1 −0 service/service/java/source/etc/workspace-service/other/authz-callout-ACTIVE.xml
  159. +1 −0 service/service/java/source/etc/workspace-service/other/authz-callout-sql.xml
  160. +2 −1 service/service/java/source/etc/workspace-service/other/main.xml
  161. +4 −3 service/service/java/source/src/org/globus/workspace/network/defaults/DefaultAssociationAdapter.java
  162. +58 −5 service/service/java/source/src/org/globus/workspace/sqlauthz/AuthzDecisionLogic.java
  163. +0 −18 service/service/java/source/src/org/globus/workspace/sqlauthz/SqlAuthz.java
  164. +1 −7 service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.conflocator.xml
  165. +0 −12 service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.xml
  166. +2 −5 service/service/java/tests/suites/basic/home/services/etc/nimbus/query/query.conf
  167. +0 −5 service/service/java/tests/suites/basic/home/services/etc/nimbus/query/users.txt
  168. +0 −77 service/service/java/tests/suites/basic/home/services/etc/nimbus/rest/other/main-fake.xml
  169. +0 −28 service/service/java/tests/suites/basic/home/services/etc/nimbus/rest/other/main.conflocator.xml
  170. +0 −86 service/service/java/tests/suites/basic/home/services/etc/nimbus/rest/other/main.xml
  171. +0 −12 service/service/java/tests/suites/basic/home/services/etc/nimbus/rest/rest.conf
  172. +1 −0 ...ce/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/authz-callout-sql.xml
  173. +2 −1 service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/main.xml
  174. +23 −0 tests/ec2-tests.sh
  175. +2 −1 tests/{ec2_test.py → ec2_repo_test.py}
  176. +112 −0 tests/ec2_submit_tests.py
  177. +71 −0 tests/reset_tests.py
  178. +2 −4 tests/user-test.sh
  179. +100 −0 tests/user_failures_tests.py
  180. +17 −0 tests/user_tests.py
  181. +9 −17 web/lib/python/ProcessManager.py
  182. +0 −4 web/nimbusweb.conf
  183. +8 −0 web/sbin/new-conf.sh
  184. +0 −31 web/src/python/nimbusrest/__init__.py
  185. +0 −61 web/src/python/nimbusrest/admin/__init__.py
  186. +0 −79 web/src/python/nimbusrest/admin/connection.py
  187. +0 −46 web/src/python/nimbusrest/admin/tests.py
  188. +0 −127 web/src/python/nimbusrest/connection.py
  189. +0 −80 web/src/python/nimbusrest/error.py
  190. +0 −28 web/src/python/nimbusrest/tests.py
  191. +1 −0 web/src/python/nimbusweb/portal/nimbus/adminops.py
  192. +4 −1 web/src/python/nimbusweb/portal/nimbus/create_web_user.py
  193. +5 −0 web/src/python/nimbusweb/portal/nimbus/forms.py
  194. +1 −1 web/src/python/nimbusweb/portal/nimbus/models.py
  195. +0 −41 web/src/python/nimbusweb/portal/nimbus/remote.py
  196. +0 −52 web/src/python/nimbusweb/portal/nimbus/tests.py
  197. +1 −0 web/src/python/nimbusweb/portal/nimbus/views.py
  198. +0 −1 web/src/python/nimbusweb/portal/settings.py
  199. +8 −0 web/src/python/nimbusweb/portal/templates/nimbus/admin.html
  200. +7 −4 web/src/python/nimbusweb/portal/templates/nimbus/profile.html
  201. +0 −1 web/src/python/nimbusweb/portal/urls.py
  202. +0 −19 web/src/python/nimbusweb/portal/usercreate/README
  203. 0 web/src/python/nimbusweb/portal/usercreate/__init__.py
  204. +0 −81 web/src/python/nimbusweb/portal/usercreate/create.py
  205. +0 −16 web/src/python/nimbusweb/portal/usercreate/forms.py
  206. +0 −7 web/src/python/nimbusweb/portal/usercreate/urls.py
  207. +0 −16 web/src/python/nimbusweb/portal/usercreate/util.py
  208. +0 −109 web/src/python/nimbusweb/portal/usercreate/views.py
  209. +1 −5 web/src/python/nimbusweb/setup/newconf.py
  210. +1 −4 web/src/python/nimbusweb/setup/setup.py
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration>
- <fileset id="fileset1" name="rest-springfiles" removed="false">
- <file>file://$MODULE_DIR$/../../messaging/rest/java/source/etc/rest/other/main.conflocator.xml</file>
- <file>file://$MODULE_DIR$/../../messaging/rest/java/source/etc/rest/other/main.xml</file>
- </fileset>
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$/../../messaging/rest/java/source">
- <sourceFolder url="file://$MODULE_DIR$/../../messaging/rest/java/source/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="common" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../lib/services/gson-1.4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="cxf-libs" level="project" />
- <orderEntry type="module" module-name="installer" />
- </component>
-</module>
-
@@ -6,9 +6,14 @@
<root url="jar://$PROJECT_DIR$/lib/clients/globus_delegation_stubs.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/services/commons-cli-2.0.jar!/" />
<root url="file://$PROJECT_DIR$/lib/clients" />
+ <root url="file://$PROJECT_DIR$/lib/clients" />
</CLASSES>
<JAVADOC />
- <SOURCES />
+ <SOURCES>
+ <root url="file://$PROJECT_DIR$/../../jets3/jets3t-0.7.3/src" />
+ <root url="jar://$PROJECT_DIR$/lib/clients/httpcore-4.0.1.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/clients/httpclient-4.0.1.jar!/" />
+ </SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib/clients" recursive="false" />
</library>
</component>
View
@@ -11,7 +11,6 @@
<module fileurl="file://$PROJECT_DIR$/.idea-modules/query/ec2query.iml" filepath="$PROJECT_DIR$/.idea-modules/query/ec2query.iml" group="protocols" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/ec2soap/ec2soap.iml" filepath="$PROJECT_DIR$/.idea-modules/ec2soap/ec2soap.iml" group="protocols" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/installer/installer.iml" filepath="$PROJECT_DIR$/.idea-modules/installer/installer.iml" />
- <module fileurl="file://$PROJECT_DIR$/.idea-modules/rest/rest.iml" filepath="$PROJECT_DIR$/.idea-modules/rest/rest.iml" group="protocols" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/rm-api/rm-api.iml" filepath="$PROJECT_DIR$/.idea-modules/rm-api/rm-api.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/service-suites//spotinstances.iml" filepath="$PROJECT_DIR$/.idea-modules/service-suites//spotinstances.iml" group="service-suites" />
<module fileurl="file://$PROJECT_DIR$/.idea-modules/service-suites/tests-common.iml" filepath="$PROJECT_DIR$/.idea-modules/service-suites/tests-common.iml" group="service-suites" />
View
@@ -57,6 +57,8 @@
<javac srcdir="${nimbus.authz.main.src.dir}"
destdir="${nimbus.authz.main.build.dest}"
classpathref="nimbus.authz.main.classpath"
+ source="1.5"
+ target="1.5"
debug="on">
<include name="**/*.java"/>
@@ -295,7 +295,6 @@ private int getParentObject(
if(!rs.next())
{
logger.debug("pstmt " + pstmt.toString());
- pstmt.close();
throw new AuthzDBException("no such parent file found " + objectName + " " + objectType);
}
int objectId = rs.getInt(1);
@@ -792,4 +791,4 @@ private void returnConnection(Connection connection)
}
}
}
-}
+}
@@ -173,6 +173,8 @@
destdir="${nimbus.autoconfig.gt4_0.build.dest}"
classpathref="nimbus.autoconfig.gt4_0.classpath"
includeantruntime="false"
+ source="1.5"
+ target="1.5"
debug="on">
<include name="**/*.java"/>
@@ -253,6 +255,18 @@
</echo>
</target>
+
+ <!-- *******************************************************************
+ DEPLOY ONLY JARS (development target)
+ ******************************************************************* -->
+
+ <target name="justjars" depends="jar, lib_copies">
+ <echo message="Copying JARs: ${basedir}" />
+ <copy todir="${gt4_0.lib.dir}" >
+ <fileset refid="garjars" />
+ </copy>
+ </target>
+
<!-- *******************************************************************
DEPLOYMENT
@@ -108,7 +108,6 @@ function examine() {
fi
}
-examine NIMBUS_CONFIG_GLOBUS_LOCATION "$NIMBUS_CONFIG_GLOBUS_LOCATION"
examine NIMBUS_CONFIG_CONTAINER_RUNNER "$NIMBUS_CONFIG_CONTAINER_RUNNER"
examine NIMBUS_CONFIG_VMM_RUNNER "$NIMBUS_CONFIG_VMM_RUNNER"
examine NIMBUS_CONFIG_VMM_RUN_KEY "$NIMBUS_CONFIG_VMM_RUN_KEY"
@@ -128,7 +127,6 @@ examine NIMBUS_CONFIG_TEST_VM_NETWORK_DNS "$NIMBUS_CONFIG_TEST_VM_NETWORK_DNS"
if [ "Xnoprint" != "X$1" ]; then
echo ""
- echo " - The GLOBUS_LOCATION in use: $NIMBUS_CONFIG_GLOBUS_LOCATION"
echo " - The account running the container/service: $NIMBUS_CONFIG_CONTAINER_RUNNER"
echo " - The hostname running the container/service: $NIMBUS_CONFIG_CONTAINER_HOSTNAME"
echo " - The contact address of the container/service for notifications: $NIMBUS_CONFIG_SSH_USE_CONTACT_STRING (port $NIMBUS_CONFIG_SSH_USE_CONTACT_PORT)"
@@ -143,12 +141,6 @@ if [ "Xnoprint" != "X$1" ]; then
echo " - The workspace-control path on VMM: $NIMBUS_CONFIG_VMM_CONTROL_EXE"
echo " - The workspace-control tmpdir on VMM: $NIMBUS_CONFIG_VMM_CONTROL_TMPDIR"
- echo ""
- echo " - Test network address IP: $NIMBUS_CONFIG_TEST_VM_NETWORK_ADDRESS"
- echo " - Test network address hostname: $NIMBUS_CONFIG_TEST_VM_NETWORK_HOSTNAME"
- echo " - Test network address gateway: $NIMBUS_CONFIG_TEST_VM_NETWORK_GATEWAY"
- echo " - Test network address DNS: $NIMBUS_CONFIG_TEST_VM_NETWORK_DNS"
-
echo ""
echo "----------"
echo ""
@@ -392,158 +384,6 @@ fi
# }}}
-# -----------------------------------------------------------------------------
-# {{{ do network sample?
-# -----------------------------------------------------------------------------
-
-DO_NET="y"
-
-if [ "$NIMWIZ_NO_NETWORK_CONFIGS" = "$NIMBUS_CONFIG_TEST_VM_NETWORK_ADDRESS" ]; then
- echo "Not configuring test network."
- DO_NET="n"
-fi
-
-if [ "$NOT_SET" = "$NIMBUS_CONFIG_TEST_VM_NETWORK_ADDRESS" ]; then
- echo "Warning: not enough information available to create a test network. No IP address."
- DO_NET="n"
-fi
-
-if [ "$DO_NET" = "y" ]; then
- if [ "$NOT_SET" = "$NIMBUS_CONFIG_TEST_VM_NETWORK_HOSTNAME" ]; then
- echo "Warning: not enough information available to create a test network. No hostname."
- DO_NET="n"
- fi
-fi
-
-if [ "$DO_NET" = "y" ]; then
- if [ "$NOT_SET" = "$NIMBUS_CONFIG_TEST_VM_NETWORK_GATEWAY" ]; then
- echo "Warning: not enough information available to create a test network. No gateway setting (this may be set to 'none' by the way)."
- DO_NET="n"
- fi
-fi
-
-if [ "$DO_NET" = "y" ]; then
- if [ "$NOT_SET" = "$NIMBUS_CONFIG_TEST_VM_NETWORK_DNS" ]; then
- echo "Warning: not enough information available to create a test network. No DNS setting (this may be set to 'none' by the way)."
- DO_NET="n"
- fi
-fi
-
-if [ "$DO_NET" = "n" ]; then
- echo ""
- echo "----------"
- echo ""
-fi
-
-# }}}
-
-# -----------------------------------------------------------------------------
-# {{{ backup networks
-# -----------------------------------------------------------------------------
-
-if [ "$DO_NET" = "y" ]; then
-
- VMMNETDIR=`$JAVA_BIN $NIMWIZ_JAVA_OPTS $EXE_GET_NETWORKDIR`
- if [ $? -ne 0 ]; then
- exit 1
- fi
-
- echo "[*] Backing up old network settings"
-
- if [ ! -d $VMMNETDIR ]; then
- echo "Not a directory? '$VMMNETDIR'"
- exit 1
- fi
-
- BASE_BACKUP_DIR="$VMMNETDIR/.backups"
-
- if [ -d "$BASE_BACKUP_DIR" ]; then
- #echo " ... base backups directory exists already '$BASE_BACKUP_DIR'"
- true
- else
- mkdir $BASE_BACKUP_DIR
- if [ $? -ne 0 ]; then
- echo ""
- echo "Problem creating directory: $BASE_BACKUP_DIR"
- exit 1
- fi
- #echo " ... created base backup directory '$BASE_BACKUP_DIR'"
- fi
-
- NEW_BACKUP_DIR=`$JAVA_BIN $NIMWIZ_JAVA_OPTS $EXE_CREATE_BACKUP_DIR $BASE_BACKUP_DIR old-networks-`
- if [ $? -ne 0 ]; then
- echo ""
- echo "Problem, exiting."
- exit 1
- fi
- echo " ... created new directory '$NEW_BACKUP_DIR'"
-
- for f in `ls $VMMNETDIR`; do
-
- CMD="mv $VMMNETDIR/$f $NEW_BACKUP_DIR/"
- $CMD
- if [ $? -ne 0 ]; then
- echo "This failed: $CMD"
- exit 1
- fi
- echo " ... moved '$f' to '$NEW_BACKUP_DIR'"
-
- done
-
- echo ""
- echo "----------"
- echo ""
-
-fi
-
-# }}}
-
-# -----------------------------------------------------------------------------
-# {{{ create sample network
-# -----------------------------------------------------------------------------
-
-if [ "$DO_NET" = "y" ]; then
-
- echo "[*] Creating new network called '$NEW_NET_NAME'"
-
- NETPATH="$VMMNETDIR/$NEW_NET_NAME"
-
- cp $NETWORK_TEMPLATE_FILE $NETPATH
- if [ $? -ne 0 ]; then
- echo "Could not create '$NETPATH' ?"
- exit 1
- fi
-
- DATE=`date`
- echo "# File contents injected @ $DATE" >> $NETPATH
- if [ $? -ne 0 ]; then
- echo "Could not write to '$NETPATH' ?"
- exit 1
- fi
-
- echo "" >> $NETPATH
- echo "# DNS server IP or 'none'" >> $NETPATH
- echo "$NIMBUS_CONFIG_TEST_VM_NETWORK_DNS" >> $NETPATH
- echo "" >> $NETPATH
-
-
- hostname="$NIMBUS_CONFIG_TEST_VM_NETWORK_HOSTNAME"
- ipaddress="$NIMBUS_CONFIG_TEST_VM_NETWORK_ADDRESS"
- gateway="$NIMBUS_CONFIG_TEST_VM_NETWORK_GATEWAY"
- broadcast="none" # this makes Nimbus guess
- subnetmask="none" # this makes Nimbus guess
-
- echo "# hostname ipaddress gateway broadcast subnetmask" >> $NETPATH
- echo "$hostname $ipaddress $gateway $broadcast $subnetmask" >> $NETPATH
- echo "" >> $NETPATH
-
- echo " ... created '$NETPATH'"
- echo "----------"
- echo ""
-fi
-
-# }}}
-
# -----------------------------------------------------------------------------
# {{{ turn off fake mode; other/common.conf --> fake.mode (set to false)
# -----------------------------------------------------------------------------
Oops, something went wrong.

0 comments on commit c90e594

Please sign in to comment.