Merge pull request #477 from tcmitchell/remove-pgch

Remove PGCH

CHANGES.md

@@ -2,6 +2,25 @@
 
 # [Release 2.11](https://github.com/GENI-NSF/geni-ch/milestones/2.11)
 
+## Installation Notes
+
+* Remove the PGCH AMsoil plugin link if it exists
+
+    ```
+    sudo rm /usr/share/geni-ch/chapi/AMsoil/src/plugins/pgch
+    ```
+
+* Remove the installed pgch directory if it exists
+
+    ```
+    sudo rm -rf /usr/share/geni-ch/chapi/chapi/plugins/pgch
+    ```
+
+## Changes
+
+* Remove PGCH service
+  ([#474](https://github.com/GENI-NSF/geni-ch/issues/474))
+
 # [Release 2.10](https://github.com/GENI-NSF/geni-ch/milestones/2.10)
 
 * Update CentOS installation docs

INSTALL-centos.md

@@ -151,7 +151,7 @@ Initialize Services
 -------------------
 
 ```Shell
-for srv in sr sa pa ma logging cs pgch km portal
+for srv in sr sa pa ma logging cs km portal
 do
     sudo mkdir -p $CH_DIR/$srv
 done
@@ -214,7 +214,7 @@ sudo chmod a+w /var/log/geni-chapi/chapi.log
 
 # Set up amsoil links to CHAPI plugins
 cd $CH_DIR/chapi/AMsoil/src/plugins
-for pl in chrm chapiv1rpc sarm marm csrm logging opsmon flaskrest pgch
+for pl in chrm chapiv1rpc sarm marm csrm logging opsmon flaskrest
 do
     sudo ln -s $CH_DIR/chapi/chapi/plugins/$pl .
 done

apache2.conf

@@ -18,5 +18,4 @@
         ScriptAlias /CS /usr/share/geni-ch/chapi/AMsoil/src/main.py
         ScriptAlias /CH /usr/share/geni-ch/chapi/AMsoil/src/main.py
         ScriptAlias /LOG /usr/share/geni-ch/chapi/AMsoil/src/main.py
-        ScriptAlias /PGCH /usr/share/geni-ch/chapi/AMsoil/src/main.py
         ScriptAlias /SR /usr/share/geni-ch/chapi/AMsoil/src/main.py

bin/chapi-log-out.txt

@@ -18,16 +18,12 @@ INFO    :amsoil:\[chv1
 INFO    :amsoil:\[sav1
 INFO    :amsoil:\[mav1
 INFO    :amsoil:\[logv1
-INFO    :amsoil:\[pgchv1
 INFO    :chapi:MA: lookup_member_info: no member_urn row
 INFO    :chapi:SA: Returning empty list of slices
 INFO    :chapi:LOG:.*Result from 
 INFO    :chapi:SA:.*Result from get_requests_by_user
-INFO    :chapi:PGCH:.*: No slice found URN urn:publicid:IDN\+ch
-INFO    :chapi:PGCH:.*: Result from Resolve: \{'output': 'No slice found URN urn:publicid:IDN\+ch.*'.*\}
 ERROR   :amsoil:\[sav1\] \[ARGUMENT\] ARGUMENT_ERROR \(Unknown slice urns: \[\['urn:publicid:IDN\+ch.*'\]\]\)
 INFO    :chapi:SA:.*: Result from lookup_slices: \{'output': "\[ARGUMENT\] ARGUMENT_ERROR \(Unknown slice urns: \[\['urn:publicid:IDN\+ch.*'\]\]\)".*\}
-INFO    :chapi:PGCH:.*: Result from Resolve: \{'output': "\[ARGUMENT\] ARGUMENT_ERROR \(Unknown slice urns: \[\['urn:publicid:IDN\+ch.*'\]\]\)".*\}
 INFO    :chapi:SPEAKSFOR: 'urn:publicid:IDN\+ch.*\+authority\+portal' is speaking for 'urn:publicid:IDN\+ch.*\+user\+
 ERROR   :amsoil:\[sav1\] \[ARGUMENT\] ARGUMENT_ERROR \(Unknown sliver urns.*\)
 INFO    :chapi:SA:.*: Result from update_sliver_info: \{'output': "\[ARGUMENT\] ARGUMENT_ERROR \(Unknown sliver urns.*\).*\}

geni-chapi.spec

@@ -193,16 +193,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geni-ch/chapi/chapi/plugins/opsmon/plugin.py
 %{_datadir}/geni-ch/chapi/chapi/plugins/opsmon/plugin.pyc
 %{_datadir}/geni-ch/chapi/chapi/plugins/opsmon/plugin.pyo
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/MANIFEST.json
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/PGCH.py
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/PGCH.pyc
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/PGCH.pyo
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/__init__.py
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/__init__.pyc
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/__init__.pyo
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/plugin.py
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/plugin.pyc
-%{_datadir}/geni-ch/chapi/chapi/plugins/pgch/plugin.pyo
 %{_datadir}/geni-ch/chapi/chapi/plugins/sarm/MANIFEST.json
 %{_datadir}/geni-ch/chapi/chapi/plugins/sarm/SAv1Guard.py
 %{_datadir}/geni-ch/chapi/chapi/plugins/sarm/SAv1Guard.pyc
@@ -276,10 +266,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/geni-ch/chapi/chapi/tools/multiclient.py
 %{_datadir}/geni-ch/chapi/chapi/tools/multiclient.pyc
 %{_datadir}/geni-ch/chapi/chapi/tools/multiclient.pyo
-%{_datadir}/geni-ch/chapi/chapi/tools/pgch_client.py
-%{_datadir}/geni-ch/chapi/chapi/tools/pgch_client.pyc
-%{_datadir}/geni-ch/chapi/chapi/tools/pgch_client.pyo
-%{_datadir}/geni-ch/chapi/chapi/tools/pgch_testall.sh
 %{_datadir}/geni-ch/chapi/chapi/tools/policy_file_checker.py
 %{_datadir}/geni-ch/chapi/chapi/tools/policy_file_checker.pyc
 %{_datadir}/geni-ch/chapi/chapi/tools/policy_file_checker.pyo

plugins/Makefile.am

@@ -69,10 +69,6 @@ nobase_dist_plugin_DATA = \
 	opsmon/plugin.py \
 	opsmon/MANIFEST.json \
 	opsmon/OpsMon.py \
-	pgch/MANIFEST.json \
-	pgch/PGCH.py \
-	pgch/__init__.py \
-	pgch/plugin.py \
 	sarm/MANIFEST.json \
 	sarm/SAv1Guard.py \
 	sarm/SAv1PersistentImplementation.py \