Renamed ONOS-VM repo to lowercase and removed password for git clone
diff --git a/README b/README
index cf9d73f..d585cbe 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@
### Building the ONOS VM
The ONOS VM is built from an existing VM image (probably the base image that we just created).
-From the ONOS-VM directory:
+From the onos-vm directory:
$ ./onos-build-vm.py -i mn-raring64server-*/mininet-vm-x86_64.vmdk -o onos-vm-v1
Note: You should replace the image file with the correct directory.
diff --git a/onos-build-vm.py b/onos-build-vm.py
index 4d3aebe..66958ff 100755
--- a/onos-build-vm.py
+++ b/onos-build-vm.py
@@ -23,7 +23,7 @@
def installONOS( vm, prompt=Prompt ):
# start with sendline
#TODO consider resizing the HDD
- url = 'https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=vm-setup.sh'
+ url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=vm-setup.sh'
vm.sendline( ' wget -O vm-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
vm.expect( prompt, timeout=20 )
vm.sendline( 'bash vm-setup.sh' )
@@ -33,10 +33,10 @@
vm.sendline('sudo su - tutorial1')
vm.expect(prompt, timeout=20)
vm.sendline( 'git clone https://gerrit.onosproject.org/onos' )
- vm.expect("Username for 'https://gerrit.onosproject.org':", timeout=30)
- vm.sendline('vm')
- vm.expect("Password for 'https://vm@gerrit.onosproject.org':", timeout=30)
- vm.sendline(os.environ['ONOSPASSWORD'])
+ #vm.expect("Username for 'https://gerrit.onosproject.org':", timeout=30)
+ #vm.sendline('vm')
+ #vm.expect("Password for 'https://vm@gerrit.onosproject.org':", timeout=30)
+ #vm.sendline(os.environ['ONOSPASSWORD'])
vm.expect( prompt, timeout=1200 )
@@ -49,7 +49,7 @@
vm.expect( prompt, timeout=1200 )
- url = 'https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos-setup.sh'
+ url = 'https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos-setup.sh'
vm.sendline( ' wget -O onos-setup.sh "%s" | bash' % url ) # space prefix is used to avoid entry in history
vm.expect( prompt, timeout=20 )
vm.sendline( 'bash onos-setup.sh' )
diff --git a/tutorial1-setup.sh b/tutorial1-setup.sh
index 43c4cf2..af07049 100644
--- a/tutorial1-setup.sh
+++ b/tutorial1-setup.sh
@@ -23,7 +23,7 @@
# -------------- Setup Wireshark dissector ----
-wget -O openflow.lua "https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=openflow.lua"
+wget -O openflow.lua "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=openflow.lua"
mkdir -p .wireshark/plugins
mv openflow.lua .wireshark/plugins
@@ -45,7 +45,7 @@
sudo sed -i 's/disable=0/disable=1/g' /etc/lxdm/default.conf
-wget -O onos.png "https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos.png"
+wget -O onos.png "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos.png"
sudo cp onos.png /usr/share/backgrounds/default.png
# Automatically start LXDE on login
diff --git a/vm-setup.sh b/vm-setup.sh
index b2c94a2..20f8e11 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -8,8 +8,8 @@
export SDN_IP_USER=sdnip
export USER_HOME=/home/${CURRENT_USER}
-URL='https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=tutorial1-setup.sh'
-SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=ONOS-VM.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=sdnip-setup.sh'
+URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=tutorial1-setup.sh'
+SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=sdnip-setup.sh'
sudo /usr/sbin/useradd -c "Basic ONOS Tutorial" -d /home/${CURRENT_USER} -U -m -p $(openssl passwd -1 ${CURRENT_USER}) -s /bin/bash ${CURRENT_USER}
sudo /usr/sbin/useradd -c "Basic SDN-IP Tutorial" -d /home/${SDN_IP_USER} -U -m -p $(openssl passwd -1 ${SDN_IP_USER}) -s /bin/bash ${SDN_IP_USER}