minor testenv cleanup

Author: jonstout

app/mpls/Dockerfile.discovery

@@ -6,7 +6,7 @@ RUN yum makecache
 RUN yum -y install epel-release
 
 RUN yum -y install perl-Carp-Always perl-Test-Deep perl-Test-Exception perl-Test-Pod perl-Test-Pod-Coverage perl-Devel-Cover nddi-tiles httpd-tools perl-Array-Utils perl-Carp-Always perl-Data-Dumper perl-Devel-Cover perl-DBI perl-DBD-mysql perl-File-Path perl-GRNOC-Config perl-Log-Log4perl perl-Net-DBus perl-Pod-Coverage perl-Test-Exception perl-Test-Deep perl-Test-Harness perl-Test-Simple perl-Test-Pod perl-Test-Pod-Coverage perl-Time-HiRes perl-XML-Simple perl-SOAP-Lite perl-NetAddr-IP perl-AnyEvent perl-AnyEvent-Fork perl-Array-Utils perl-Class-Accessor perl-Data-UUID perl-DateTime perl-Exporter perl-File-ShareDir perl-Getopt-Long perl-GRNOC-Config perl-GRNOC-Log perl-GRNOC-RabbitMQ perl-JSON perl-JSON-WebToken perl-JSON-XS perl-List-Compare perl-List-MoreUtils perl-Net-DBus perl-Net-Netconf perl-Proc-Daemon perl-Proc-ProcessTable perl-Set-Scalar perl-Socket perl-Storable perl-Switch perl-Sys-Syslog perl-Template-Toolkit perl-URI perl-XML-Simple perl-XML-Writer perl-SOAP-Lite perl-MIME-Lite-TT-HTML perl-Graph yui2 perl-Paws perl-XML-LibXML perl-GRNOC-WebService
-RUN yum -y install perl-GRNOC-WebService-Client
+RUN yum -y install perl-GRNOC-WebService-Client perl-AnyEvent-HTTP
 RUN yum -y install grnoc-routerproxy inotify-tools
 
 COPY docker/rerunner.sh /bin/rerunner.sh

app/mpls/Dockerfile.fwdctl

@@ -6,7 +6,7 @@ RUN yum makecache
 RUN yum -y install epel-release
 
 RUN yum -y install perl-Carp-Always perl-Test-Deep perl-Test-Exception perl-Test-Pod perl-Test-Pod-Coverage perl-Devel-Cover nddi-tiles httpd-tools perl-Array-Utils perl-Carp-Always perl-Data-Dumper perl-Devel-Cover perl-DBI perl-DBD-mysql perl-File-Path perl-GRNOC-Config perl-Log-Log4perl perl-Net-DBus perl-Pod-Coverage perl-Test-Exception perl-Test-Deep perl-Test-Harness perl-Test-Simple perl-Test-Pod perl-Test-Pod-Coverage perl-Time-HiRes perl-XML-Simple perl-SOAP-Lite perl-NetAddr-IP perl-AnyEvent perl-AnyEvent-Fork perl-Array-Utils perl-Class-Accessor perl-Data-UUID perl-DateTime perl-Exporter perl-File-ShareDir perl-Getopt-Long perl-GRNOC-Config perl-GRNOC-Log perl-GRNOC-RabbitMQ perl-JSON perl-JSON-WebToken perl-JSON-XS perl-List-Compare perl-List-MoreUtils perl-Net-DBus perl-Net-Netconf perl-Proc-Daemon perl-Proc-ProcessTable perl-Set-Scalar perl-Socket perl-Storable perl-Switch perl-Sys-Syslog perl-Template-Toolkit perl-URI perl-XML-Simple perl-XML-Writer perl-SOAP-Lite perl-MIME-Lite-TT-HTML perl-Graph yui2 perl-Paws perl-XML-LibXML perl-GRNOC-WebService
-RUN yum -y install perl-GRNOC-WebService-Client
+RUN yum -y install perl-GRNOC-WebService-Client perl-AnyEvent-HTTP
 RUN yum -y install grnoc-routerproxy inotify-tools
 
 COPY docker/rerunner.sh /bin/rerunner.sh

docker-compose.development.yml

@@ -30,7 +30,7 @@ services:
     image: oess-frontend:latest
     restart: always
     ports:
-      - 8080:8080
+      - 8000:8080
     env_file:
       - .env
     volumes:

docker/oess.conf

@@ -57,7 +57,7 @@ PassEnv GRAFANA_GRAPH_ROUTING_PANEL_ID
 
 	AuthType Basic
 	AuthName "OESS"
-	AuthUserFile /usr/share/oess-frontend/.htpasswd
+	AuthUserFile /usr/share/oess-frontend/www/.htpasswd
 	Require valid-user
 </Location>
 
@@ -82,7 +82,7 @@ PassEnv GRAFANA_GRAPH_ROUTING_PANEL_ID
 
 	AuthType Basic
 	AuthName "OESS"
-	AuthUserFile /usr/share/oess-frontend/.htpasswd
+	AuthUserFile /usr/share/oess-frontend/www/.htpasswd
 	Require valid-user
 </Location>
 
@@ -94,7 +94,7 @@ PassEnv GRAFANA_GRAPH_ROUTING_PANEL_ID
 
 	  AuthType Basic
 	  AuthName "OESS"
-	  AuthUserFile /usr/share/oess-frontend/.htpasswd
+	  AuthUserFile /usr/share/oess-frontend/www/.htpasswd
 	  Require valid-user
 </Location>
 

perl-lib/OESS/entrypoint.dev.sh

@@ -34,7 +34,7 @@ sed -i "s/oess_test/oess/" /etc/oess/database.xml
 sed -i "s/test/$MYSQL_PASS/" /etc/oess/database.xml
 sed -i "s/vpn\-mpls/$OESS_NETWORK_TYPE/" /etc/oess/database.xml
 sed -i "s/OESS_PASSWORD/$OESS_PASSWORD/" /etc/oess/database.xml
-sed -i "s/NSO_HOST/$NSO_HOST/" /etc/oess/database.xml
+sed -i "s@NSO_HOST@$NSO_HOST@" /etc/oess/database.xml
 sed -i "s/NSO_PASSWORD/$NSO_PASSWORD/" /etc/oess/database.xml
 sed -i "s/NSO_USERNAME/$NSO_USERNAME/" /etc/oess/database.xml
 sed -i "s/OESS_LOCAL_ASN/$OESS_LOCAL_ASN/" /etc/oess/database.xml