new file mode 100644

@@ -0,0 +1,15 @@

+diff -uNr iperf-3.1_orig/src/Makefile.am iperf-3.1/src/Makefile.am

+--- iperf-3.1_orig/src/Makefile.am	2015-10-16 10:01:09.000000000 -0700

+@@ -49,9 +49,9 @@

+ iperf3_profile_SOURCES  = main.c \

+ 						  $(libiperf_la_SOURCES)

+ 

+-iperf3_profile_CFLAGS   = -pg -g

++iperf3_profile_CFLAGS   = -g

+ iperf3_profile_LDADD    = libiperf.la

+-iperf3_profile_LDFLAGS  = -pg -g

++iperf3_profile_LDFLAGS  = -g

+ 

+ # Specify the sources and various flags for the test cases

+ t_timer_SOURCES         = t_timer.c

new file mode 100644

@@ -0,0 +1,68 @@

+Summary:        A network performance benchmark tool.

+Name:           iperf

+Version:        3.1

+Release:        1%{?dist}

+License:        GPL

+URL:            https://github.com/esnet/iperf

+Group:          Applications/System

+Vendor:         VMware, Inc.

+Distribution:   Photon

+#Source download URL: https://github.com/esnet/iperf/archive/3.1.tar.gz

+Source0:        https://github.com/esnet/iperf/archive/%{name}-%{version}.tar.gz

+Patch1:         disablepg.patch

+%define sha1 iperf=0e00ce535b02b869b53649ef50fc1516a49c858c

+BuildRequires:  autoconf

+BuildRequires:  automake

+

+%description

+ipref is a network performance measurement tool that can measure the maximum

+achievable network bandwidth on IP networks. It supports tuning of various

+parameters related to timing, protocols, and buffers.  For each test it

+reports the bandwidth, loss, and other parameters.

+

+%package        doc

+Summary:        Documentation for iperf

+%description    doc

+It contains the documentation and manpages for iperf package.

+Requires:       %{name} = %{version}-%{release}

+

+%prep

+%setup -q

+%patch1 -p1

+

+%build

+echo "VDBG optflags: " %{optflags}

+./bootstrap.sh

+./configure \

+        CFLAGS="%{optflags}" \

+        CXXFLAGS="%{optflags}" \

+        --disable-silent-rules \

+        --prefix=%{_prefix} \

+        --bindir=%{_bindir} \

+        --sbindir=%{_sbindir} \

+        --includedir=%{_includedir} \

+        --libdir=%{_libdir} \

+        --mandir=%{_mandir} \

+        --infodir=%{_infodir} \

+        --datadir=%{_datarootdir} \

+        --sysconfdir=/etc

+make %{?_smp_mflags}

+

+%install

+[ %{buildroot} != "/"] && rm -rf %{buildroot}/*

+make DESTDIR=%{buildroot} install

+

+%files

+%defattr(-,root,root)

+%{_bindir}/iperf3

+%{_includedir}/iperf_api.h

+%{_libdir}/libiperf.*

+

+%files doc

+%defattr(-,root,root,-)

+%{_mandir}/man1/iperf3.1.gz

+%{_mandir}/man3/libiperf.3.gz

+

+%changelog

+*       Wed Oct 28 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.7.0-1

+-       Add iperf v3.1 package.

new file mode 100644

@@ -0,0 +1,14 @@

+{

+    "minimal" : {

+        "title" : "Photon Minimal",

+        "file" : "packages_minimal_ova.json",

+        "visible" : true,

+        "include" : []

+    },

+    "ovs" : {

+        "title" : "Photon OVS packages",

+        "file" : "packages_ovs.json",

+        "visible" : true,

+        "include" : ["minimal"]

+    }

+}

@@ -9,5 +9,5 @@

 		"dhcp-client","dhcp-server","dhcp-libs","dhcp-devel","initscripts","net-tools",

 	        "jaxws-ri","commons-daemon","runit", "python-pyasn1", "WALinuxAgent", "linux-esx",

 	        "python-Twisted", "python-zope.interface", "python-ipaddr", "chkconfig", "libnss-ato",

-		"procmail","dmidecode"]

+		"procmail","dmidecode","iperf"]

 }

new file mode 100644

@@ -0,0 +1,4 @@

+{

+    "packages":["openvswitch", "iperf"]

+}

+

@@ -34,7 +34,7 @@ cp $VMDK_CONFIG_FILE $VMDK_CONFIG_SAFE_FILE

 cp ${BUILD_SCRIPTS_PATH}/mk-setup-vmdk.sh .

 cp ${BUILD_SCRIPTS_PATH}/mk-clean-vmdk.sh .

-if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ]

+if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ] && [ $IMG_NAME != "ova_ovs" ]

   then

     cp ${BUILD_SCRIPTS_PATH}/mk-setup-grub.sh .

 fi

@@ -54,6 +54,7 @@ if [ -n "$ADDITIONAL_RPMS_PATH" ]

 fi

 ./photonInstaller.py -p $GENERATED_DATA_PATH/build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $INSTALLER_PATH/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -f $VMDK_CONFIG_SAFE_FILE

+cat $VMDK_CONFIG_SAFE_FILE

 rm $VMDK_CONFIG_SAFE_FILE

 cd $BUILD_SCRIPTS_PATH

@@ -94,7 +95,7 @@ if [ -n "$ADDITIONAL_RPMS_PATH" ]

     rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/additional_rpms/

 fi

-if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ]

+if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ] && [ $IMG_NAME != "ova_ovs" ]

   then

     #Copy the initrd image

     rm -rf /tmp/initrd*

@@ -11,7 +11,7 @@ rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

 sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-ova.vmdk|" vmx-template > /tmp/vmx-temp.vmx

 sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-custom.vmdk|" vmx-template > /tmp/vmx-temp-custom.vmx

-cp update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

+cp ../update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

 cd $SRC_ROOT/tools/src/vixDiskUtil

 mkdir -p $SRC_ROOT/tools/bin

deleted file mode 100755

@@ -1,32 +0,0 @@

-#!/usr/bin/python2

-

-import os

-import crypt

-import random

-import string

-import sys

-import re

-

-

-def crypt_password(password, root_path):

-    shadow_password = crypt.crypt(password, "$6$" + "".join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]))

-

-    shadow_filename = os.path.join(root_path, 'etc/shadow')

-    

-    if os.path.isfile(shadow_filename) == False:

-        with open(shadow_filename, "w") as destination:

-            destination.write("root:"+shadow_password+":")

-    else:

-        #add password hash in shadow file

-        with open(shadow_filename, "r") as source:

-            lines=source.readlines()

-

-        with open(shadow_filename, "w") as destination:

-            for line in lines:

-                destination.write(re.sub("root:x:",  "root:"+shadow_password+":",  line))

-

-if __name__ == '__main__':

-    if len(sys.argv) < 3:

-        print ("Usage : update_custom_password.py <password> <root_path>")

-        sys.exit(1)

-    crypt_password(str(sys.argv[1]), str(sys.argv[2]))

@@ -11,7 +11,7 @@ rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

 sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-generic-ova.vmdk|" vmx-generic-template > /tmp/vmx-generic-temp.vmx

 sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-generic-custom.vmdk|" vmx-generic-template > /tmp/vmx-generic-temp-custom.vmx

-cp update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

+cp ../update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

 cd $SRC_ROOT/tools/src/vixDiskUtil

 mkdir -p $SRC_ROOT/tools/bin

deleted file mode 100755

@@ -1,32 +0,0 @@

-#!/usr/bin/python2

-

-import os

-import crypt

-import random

-import string

-import sys

-import re

-

-

-def crypt_password(password, root_path):

-    shadow_password = crypt.crypt(password, "$6$" + "".join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]))

-

-    shadow_filename = os.path.join(root_path, 'etc/shadow')

-    

-    if os.path.isfile(shadow_filename) == False:

-        with open(shadow_filename, "w") as destination:

-            destination.write("root:"+shadow_password+":")

-    else:

-        #add password hash in shadow file

-        with open(shadow_filename, "r") as source:

-            lines=source.readlines()

-

-        with open(shadow_filename, "w") as destination:

-            for line in lines:

-                destination.write(re.sub("root:x:",  "root:"+shadow_password+":",  line))

-

-if __name__ == '__main__':

-    if len(sys.argv) < 3:

-        print ("Usage : update_custom_password.py <password> <root_path>")

-        sys.exit(1)

-    crypt_password(str(sys.argv[1]), str(sys.argv[2]))

new file mode 100755

@@ -0,0 +1,65 @@

+#!/bin/bash

+set -x

+PHOTON_IMG_OUTPUT_PATH=$1

+SRC_ROOT=$2

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.vmdk

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

+sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-ova-ovs.vmdk|" vmx-ovs-template > /tmp/vmx-temp-ovs.vmx

+

+cp ../update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

+

+cd $SRC_ROOT/tools/src/vixDiskUtil

+mkdir -p $SRC_ROOT/tools/bin

+make clean

+make

+

+cd $PHOTON_IMG_OUTPUT_PATH

+

+DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-ova_ovs.raw`

+echo "Mapping device partition to loop device"

+kpartx -av $DISK_DEVICE

+DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

+echo "DISK_DEVICE=$DISK_DEVICE"

+echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

+

+rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs

+mkdir $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs

+

+mount -v -t ext4 /dev/mapper/${DEVICE_NAME}p2 $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/systemd/system/multi-user.target.wants/cloud-*

+cp $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/shadow $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/shadow.bak

+sed -e "s/^\(root:\)[^:]*:/\1x:/" $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/shadow.bak > $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/shadow

+./update_custom_password.py ovs $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/shadow-

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs/etc/shadow.bak

+umount $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs

+

+echo "Deleting device map partition"

+kpartx -d $DISK_DEVICE

+rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs

+echo "Detaching loop device from raw disk"

+losetup -d $DISK_DEVICE

+

+

+$SRC_ROOT/tools/bin/vixdiskutil -convert $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs.raw -cap 16000 $PHOTON_IMG_OUTPUT_PATH/photon-ova-ovs.vmdk

+$SRC_ROOT/tools/bin/vixdiskutil -wmeta toolsVersion 2147483647 $PHOTON_IMG_OUTPUT_PATH/photon-ova-ovs.vmdk

+

+mkdir -p $PHOTON_IMG_OUTPUT_PATH/temp

+ovftool /tmp/vmx-temp-ovs.vmx $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-ovs.ovf

+cd $PHOTON_IMG_OUTPUT_PATH/temp

+

+sed -i "s/otherGuest/other3xLinux64Guest/g" $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-ovs.ovf

+#disable pcibridge and add uefi metadata

+#sed -i '/vmw:value="efi"\/>/a \ \t<vmw:ExtraConfig ovf:required="false" vmw:key="uefi.secureBoot.enabled" vmw:value="TRUE"/>\n \ \t<vmw:ExtraConfig ovf:required="false" vmw:key="pciBridge5.present" vmw:value="false"/>\n \ \t<vmw:ExtraConfig ovf:required="false" vmw:key="pciBridge6.present" vmw:value="false"/>\n \ \t<vmw:ExtraConfig ovf:required="false" vmw:key="pciBridge7.present" vmw:value="false"/> ' $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-ovs.ovf

+#Add product info

+sed -i '/\/VirtualSystem>/i \ \t<ProductSection> \n \t\t<Info>Information about the installed software</Info> \n \t\t<Product>Photon</Product> \n \t\t<Vendor>VMware Inc.</Vendor> \n \t\t<Version>1.0.0</Version> \n \t\t<FullVersion>1.0.0-TP3</FullVersion> \n \t</ProductSection> ' $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-ovs.ovf

+

+openssl sha1 *.vmdk photon-ova-ovs.ovf > photon-ova-ovs.mf

+tar cf photon-ova-ovs-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-ova-ovs.ovf photon-ova-ovs.mf photon-ova-ovs-disk1.vmdk

+cp $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-ovs-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/

+

+rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_ovs.raw

+

new file mode 100644

@@ -0,0 +1,11 @@

+{

+    "hostname": "photon-ovs",

+    "password":

+    {

+        "crypted": false,

+        "text": "ovs"

+    },

+    "type": "ovs",

+    "size": {"root": "8", "swap": "0"},

+    "public_key":"<ssh-key-here>"

+}

new file mode 100644

@@ -0,0 +1,19 @@

+.encoding = "UTF-8"

+virtualHW.version = "13"

+scsi0.present = "TRUE"

+scsi0.virtualDev = "pvscsi"

+scsi0:0.present = "TRUE"

+scsi0:0.fileName = "VMDK_IMAGE"

+ethernet0.present = "TRUE"

+ethernet0.virtualDev = "vmxnet3"

+ethernet0.wakeOnPcktRcv = "FALSE"

+ethernet0.addressType = "generated"

+ethernet0.linkStatePropagation.enable = "TRUE"

+ethernet0.connectionType = "None"

+displayName = "Photon"

+guestOS = "*other26xLinux64Guest"

+memsize = "2048"

+ide1:0.present = "TRUE"

+ide1:0.autodetect = "TRUE"

+ide1:0.deviceType = "cdrom-raw"

+ide1:0.startConnected = "FALSE"

new file mode 100755

@@ -0,0 +1,32 @@

+#!/usr/bin/python2

+

+import os

+import crypt

+import random

+import string

+import sys

+import re

+

+

+def crypt_password(password, root_path):

+    shadow_password = crypt.crypt(password, "$6$" + "".join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]))

+

+    shadow_filename = os.path.join(root_path, 'etc/shadow')

+    

+    if os.path.isfile(shadow_filename) == False:

+        with open(shadow_filename, "w") as destination:

+            destination.write("root:"+shadow_password+":")

+    else:

+        #add password hash in shadow file

+        with open(shadow_filename, "r") as source:

+            lines=source.readlines()

+

+        with open(shadow_filename, "w") as destination:

+            for line in lines:

+                destination.write(re.sub("root:x:",  "root:"+shadow_password+":",  line))

+

+if __name__ == '__main__':

+    if len(sys.argv) < 3:

+        print ("Usage : update_custom_password.py <password> <root_path>")

+        sys.exit(1)

+    crypt_password(str(sys.argv[1]), str(sys.argv[2]))