Skip to content

Commit 3090dc6

Browse files
achandrasekarGerrit Code Review
authored andcommitted
Rename devbox-photon to devbox
Change-Id: Idfc27440b5df5a0e066d58e6f3140f4ac273cf30
1 parent 088a962 commit 3090dc6

24 files changed

+16
-16
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ If you're looking to play with the code, keep reading.
2222

2323
The product is arranged in a single repository, with subdirectories arranged by language. See the individual READMEs for instructions on building the code.
2424

25-
* [Devbox](devbox-photon/README.md): Devbox uses [Vagrant](http://vagrantup.com) to create a small standalone deployment of Photon Controller for test purposes.
25+
* [Devbox](devbox/README.md): Devbox uses [Vagrant](http://vagrantup.com) to create a small standalone deployment of Photon Controller for test purposes.
2626
* [Java](java/README.md): Most of the Photon Controller management plane is written in Java, with many individual services implemented on top of the [Xenon framework](http://vmware.github.io/xenon).
2727
* [Python](python/README.md): The ESX agent and its test and analysis collateral are implemented in Python.
2828
* [Ruby](ruby/README.md): The Photon Controller CLI is implemented in Ruby, as are the integration tests for the product.
@@ -38,7 +38,7 @@ If you have not signed our contributor license agreement (CLA), our bot will upd
3838
All pull requests satisfy the following criteria:
3939

4040
1. Pass **unit tests** according to the instructions in the appropriate language-specific README file.
41-
2. Pass **integration tests** according to the instructions for [Devbox](devbox-photon/README.md).
41+
2. Pass **integration tests** according to the instructions for [Devbox](devbox/README.md).
4242

4343
We will run any changes through our own validation process which ensures that both conditions are met, but it's in everyone's interest if you take care of this on your own first.
4444

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ In order to control the devbox VM, Vagrant needs a plugin for Photon OS. The plu
3030

3131
#### Start and provision devbox
3232

33-
We use Gradle for building and provisioning the devbox. From `/java` or `/devbox-photon`, run:
33+
We use Gradle for building and provisioning the devbox. From `/java` or `/devbox`, run:
3434

3535
./gradlew :devbox:up
3636

3737
This will bring up Vagrant, create one VM (two if ENABLE_AUTH is set to `true`), build all service containers, then start them. Your devbox is now ready.
3838

39-
If devbox is being used as a management VM, you need to seed a deployment document into Photon Controller for some system properties. These properties can be set from environment variables (see below). From `/devbox-photon`, run:
39+
If devbox is being used as a management VM, you need to seed a deployment document into Photon Controller for some system properties. These properties can be set from environment variables (see below). From `/devbox`, run:
4040

4141
./seed_deployment.sh
4242

@@ -89,9 +89,9 @@ If for some reason devbox VM cannot be destroyed via Vagrant command (`vagrant d
8989

9090
Sample output may look like this:
9191

92-
"devbox-photon_photon_1446051688357_62198" {4b963230-c8b4-434d-b70d-39270373fa65}
92+
"devbox_photon_1446051688357_62198" {4b963230-c8b4-434d-b70d-39270373fa65}
9393

94-
Notice the machine ID ("devbox-photon_photon_1446051688357_62198").
94+
Notice the machine ID ("devbox_photon_1446051688357_62198").
9595

9696
* If the VM is not running, identify it with the following command:
9797

@@ -103,15 +103,15 @@ Notice the machine ID ("devbox-photon_photon_1446051688357_62198").
103103

104104
for example:
105105

106-
vboxmanage controlvm devbox-photon_photon_1446051688357_62198 poweroff
106+
vboxmanage controlvm devbox_photon_1446051688357_62198 poweroff
107107

108108
* Unregister the VM (with optional deletion of its artifacts)
109109

110110
`vboxmanage unregistervm <machine ID> [--delete]`
111111

112112
for example:
113113

114-
vboxmanage unregistervm devbox-photon_photon_1446051688357_62198 --delete
114+
vboxmanage unregistervm devbox_photon_1446051688357_62198 --delete
115115

116116
## Controlling devbox behavior with environment variables
117117

@@ -315,4 +315,4 @@ To start everything:
315315
These start scripts will stop, remove, and restart their respective service containers.
316316

317317
## Gradle wrapper
318-
The root of the Gradle project is under `/java`, so a wrapper is provided under `/devbox-photon` that forwards calls to `/java/gradlew`. This is just for the convenience of invoking `./gradlew` from `/devbox-photon` without having to change directories or open another shell.
318+
The root of the Gradle project is under `/java`, so a wrapper is provided under `/devbox` that forwards calls to `/java/gradlew`. This is just for the convenience of invoking `./gradlew` from `/devbox` without having to change directories or open another shell.
File renamed without changes.

devbox-photon/prepare-devbox-deployment.sh renamed to devbox/prepare-devbox-deployment.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ vagrant ssh -c "sudo docker cp photon-controller-core:/etc/esxcloud-deployer/ /e
3333
vagrant ssh -c "sudo mkdir -p /usr/lib/esxcloud/photon-controller-core/"
3434
vagrant ssh -c "sudo docker cp photon-controller-core:/usr/lib/esxcloud/photon-controller-core/scripts/ /usr/lib/esxcloud/photon-controller-core/"
3535

36-
photon_vm=$(VBoxManage list runningvms | grep devbox-photon_photon | sed 's/"\(.*\)".*/\1/')
36+
photon_vm=$(VBoxManage list runningvms | grep devbox_photon | sed 's/"\(.*\)".*/\1/')
3737

3838
# removing all docker containers in the vagrant box
3939
#
File renamed without changes.

0 commit comments

Comments
 (0)