root@obriensystemskub0:~# cd oom-20170828c
root@obriensystemskub0:~/oom-20170828c# git clone -b release-1.0.0 ssh://michaelobrien@gerrit.onap.org:29418/oom
Cloning into 'oom'...
remote: Counting objects: 787, done
remote: Finding sources: 100% (62/62)
remote: Total 1370 (delta 5), reused 1342 (delta 5)
Receiving objects: 100% (1370/1370), 1.01 MiB | 442.00 KiB/s, done.
Resolving deltas: 100% (449/449), done.
Checking connectivity... done.
root@obriensystemskub0:~/oom-20170828c# git pull
fatal: Not a git repository (or any of the parent directories): .git
root@obriensystemskub0:~/oom-20170828c# cd oom
root@obriensystemskub0:~/oom-20170828c/oom# ls
cloudify  kubernetes  message-router-blueprint.yaml
root@obriensystemskub0:~/oom-20170828c/oom# cd kubernetes/oneclick/
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git pull
Already up-to-date.
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# vi 
aai.sh             createAll.bash     deleteAll.bash     mso.sh             portal.sh          sdc.sh             setenv.bash
appc.sh            dcae.sh            message-router.sh  policy.sh          robot.sh           sdnc.sh            vid.sh
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# vi dcae.sh 
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git status
On branch release-1.0.0
Your branch is up-to-date with 'origin/release-1.0.0'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout – <file>..." to discard changes in working directory)
    modified:   dcae.sh
no changes added to commit (use "git add" and/or "git commit -a")
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git commit -am "verifying release-1.0.0 accepts merges"
[release-1.0.0 ebc0704] verifying release-1.0.0 accepts merges
 1 file changed, 1 insertion, 1 deletion
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git review -s
Could not connect to gerrit.
Enter your gerrit username: michaelobrien
Trying again with ssh://michaelobrien@gerrit.onap.org:29418/oom
Creating a git remote called "gerrit" that maps to:
    ssh://michaelobrien@gerrit.onap.org:29418/oom
This repository is now set up for use with git-review. You can set the
default username for future repositories with:
  git config --global --add gitreview.username "michaelobrien"
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git commit -as --amend
[release-1.0.0 cdbdad6] verifying release-1.0.0 accepts merges
 Date: Mon Aug 28 16:49:08 2017 -0400
 1 file changed, 1 insertion, 1 deletion
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git review
Errors running git rebase -p -i remotes/gerrit/master
error: could not apply 84a9977... apply bug fix to release-1.0.0 its env. agnostic
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Could not pick 84a99779c29596dbd5f60491043e228c4c3be5d3
It is likely that your change has a merge conflict. You may resolve it in the working tree now as described above and then run 'git review' again, or if you do not want to resolve it yet (note that the change can not merge until the conflict is resolved) you may run 'git rebase --abort' then 'git review -R' to upload the change without rebasing.
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git status
interactive rebase in progress; onto c2384bd
Last command done (1 command done):
   pick 84a9977 apply bug fix to release-1.0.0 its env. agnostic
Next commands to do (2 remaining commands):
   pick 4bf6427 correct sed command so its env. agnostic
   pick cdbdad6 verifying release-1.0.0 accepts merges
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'release-1.0.0' on 'c2384bd'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
    both modified:   createAll.bash
no changes added to commit (use "git add" and/or "git commit -a")
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# cat createAll.bash 
#!/bin/bash
. $(dirname "$0")/setenv.bash
usage() {
  cat <<EOF
Usage: $0 [PARAMs]
-u                  : Display usage
-n [NAMESPACE]      : Kubernetes namespace (required)
-i [INSTANCE]       : ONAP deployment instance # (default: 1)
-a [APP]            : Specify a specific ONAP component (default: all)
                      from the following choices:
                      sdc, aai ,mso, message-router, robot,
                      vid, sdnc, portal, policy, appc
EOF
}
create_namespace() {
  kubectl create namespace $1-$2
}
create_registry_key() {
  kubectl -namespace $1$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7
}
<<<<<<< HEAD
create_onap_helm() {
  helm install ../$2/ --name $2 --namespace $1 --set nsPrefix=$1
=======
create_service() {
  sed i- 's/nodePort: [0-9]\\{2}[02468]
{1}/nodePort: '"$3"'/g' ../$2/all-services.yaml
  sed i- 's/nodePort: [0-9]\\{2}[13579]
{1\}/nodePort: '"$4"'/g' ../$2/all-services.yaml   kubectl --namespace $1-$2 create -f ../$2/all-services.yaml   mv ../$2/all-services.yaml-- ../$2/all-services.yaml >>>>>>> 84a9977... apply bug fix to release-1.0.0 its env. agnostic }
configure_app() {
  # if previous configuration exists put back original template file
  for file in $3/*.yaml; do
    if [ -e "$file-template" ]; then
      mv "$file-template" "${file%}"
    fi
  done
  
  if [ -e "$2/Chart.yaml" ]; then
    sed i- 's/nodePort: [0-9]\\{2}[02468]
{1}/nodePort: '"$4"'/g' $3/all-services.yaml
    sed i- 's/nodePort: [0-9]\\{2}[13579]
{1\}/nodePort: '"$5"'/g' $3/all-services.yaml   fi }
#MAINs
NS=
INCL_SVC=true
APP=
INSTANCE=1
MAX_INSTANCE=5
DU=$ONAP_DOCKER_USER
DP=$ONAP_DOCKER_PASS
while getopts ":n:u:s:i:a:du:dp:" PARAM; do
  case $PARAM in
    u)
      usage
      exit 1
      ;;
    n)
      NS=${OPTARG}
      ;;
    i)
      INSTANCE=${OPTARG}
      ;;
    a)
      APP=${OPTARG}
      if [[ -z $APP ]]; then
        usage
        exit 1
      fi
      ;;
    du)
      DU=${OPTARG}
      ;;
    dp)
      DP=${OPTARG}
      ;;
    ?)
      usage
      exit
      ;;
  esac
done
if [[ -z $NS ]]; then
  usage
  exit 1
fi
if [[ ! -z "$APP" ]]; then
  HELM_APPS=($APP)
fi
if [ "$INSTANCE" -gt "$MAX_INSTANCE" ];then
  printf "\n********** You choose to create ${INSTANCE}th instance of ONAP \n"
  printf "\n********** Due to port allocation only ${MAX_INSTANCE} instances of ONAP is allowed per kubernetes deployment\n"
  exit 1
fi
start=$((300+2*INSTANCE))
end=$((start+1))
printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${start}00 and ${end}99\n"
printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n"
printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n"
for i in ${HELM_APPS[@]}; do
  printf "\nCreating namespace **********\n"
  create_namespace $NS $i
  printf "\nCreating registry secret **********\n"
  create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL
  printf "\nCreating deployments and services **********\n"
  _FILES_PATH=$(echo ../$i/templates)
  configure_app $NS $i $_FILES_PATH $start $end
  create_onap_helm $NS $i
  printf "\n"
done
printf "\n**** Done ****\n"
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# vi createAll.bash 
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git rebase --continue
kubernetes/oneclick/createAll.bash: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git add createAll.bash 
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git rebase --continue
[detached HEAD dc53128] apply bug fix to release-1.0.0 its env. agnostic
 Author: Munir Ahmad <munir.ahmad@bell.ca>
 1 file changed, 5 insertions, 2 deletions
error: could not apply 4bf6427... correct sed command so its env. agnostic
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
Could not pick 4bf6427f67a779e4823a4797e70316bfbfa7257a
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git rebase --continue
kubernetes/oneclick/createAll.bash: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git status
interactive rebase in progress; onto c2384bd
Last commands done (2 commands done):
   pick 84a9977 apply bug fix to release-1.0.0 its env. agnostic
   pick 4bf6427 correct sed command so its env. agnostic
Next command to do (1 remaining command):
   pick cdbdad6 verifying release-1.0.0 accepts merges
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'release-1.0.0' on 'c2384bd'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
    both modified:   createAll.bash
no changes added to commit (use "git add" and/or "git commit -a")
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# vi createAll.bash 
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git add createAll.bash 
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git status
interactive rebase in progress; onto c2384bd
Last commands done (2 commands done):
   pick 84a9977 apply bug fix to release-1.0.0 its env. agnostic
   pick 4bf6427 correct sed command so its env. agnostic
Next command to do (1 remaining command):
   pick cdbdad6 verifying release-1.0.0 accepts merges
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'release-1.0.0' on 'c2384bd'.
  (all conflicts fixed: run "git rebase --continue")
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
    modified:   createAll.bash
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git review
Errors running git rebase -p -i remotes/gerrit/master
It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
    git rebase (--continue | --abort | --skip)
If that is not the case, please
    rm -fr "/root/oom-20170828c/oom/.git/rebase-merge"
and run me again.  I am stopping in case you still have something
valuable there.
It is likely that your change has a merge conflict. You may resolve it in the working tree now as described above and then run 'git review' again, or if you do not want to resolve it yet (note that the change can not merge until the conflict is resolved) you may run 'git rebase --abort' then 'git review -R' to upload the change without rebasing.
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git rebase --continue
Use "fg" to return to nano.
[1]+  Stopped                 git rebase --continue
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git review
Errors running git rebase -p -i remotes/gerrit/master
It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
    git rebase (--continue | --abort | --skip)
If that is not the case, please
    rm -fr "/root/oom-20170828c/oom/.git/rebase-merge"
and run me again.  I am stopping in case you still have something
valuable there.
It is likely that your change has a merge conflict. You may resolve it in the working tree now as described above and then run 'git review' again, or if you do not want to resolve it yet (note that the change can not merge until the conflict is resolved) you may run 'git rebase --abort' then 'git review -R' to upload the change without rebasing.
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git status
interactive rebase in progress; onto c2384bd
Last commands done (2 commands done):
   pick 84a9977 apply bug fix to release-1.0.0 its env. agnostic
   pick 4bf6427 correct sed command so its env. agnostic
Next command to do (1 remaining command):
   pick cdbdad6 verifying release-1.0.0 accepts merges
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'release-1.0.0' on 'c2384bd'.
  (all conflicts fixed: run "git rebase --continue")
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
    modified:   createAll.bash
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git rebase --continue
[detached HEAD e21681b] correct sed command so its env. agnostic
 Author: Munir Ahmad <munir.ahmad@bell.ca>
 1 file changed, 12 insertions, 5 deletions
Successfully rebased and updated refs/heads/release-1.0.0.
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.
The outstanding commits are:
f028ddb (HEAD -> release-1.0.0) verifying release-1.0.0 accepts merges
e21681b correct sed command so its env. agnostic
dc53128 apply bug fix to release-1.0.0 its env. agnostic
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Processing changes: refs: 1, done            
To ssh://michaelobrien@gerrit.onap.org:29418/oom
 ! [remote rejected] HEAD -> refs/publish/master/release-1.0.0 (change http://gerrit.onap.org/r/8723 closed)
error: failed to push some refs to 'ssh://michaelobrien@gerrit.onap.org:29418/oom'
root@obriensystemskub0:~/oom-20170828c/oom/kubernetes/oneclick# git review