From 8e33f2caf50d5db750d1f2a76a7b1b28f6a2b8be Mon Sep 17 00:00:00 2001
From: Matt Love <mtt.lov@gmail.com>
Date: Mon, 24 Jun 2019 13:57:50 -0700
Subject: [PATCH 1/5] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 46 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..c17c43b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,46 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## Information
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+## Environment
+
+### Back End
+**Server:**
+ - OS: [e.g. Ubuntu, CentOS]
+ - Python Version: 
+ - Reverse Proxy: [e.g. NGINX, Caddy]
+ - Redis Version: 
+
+### Front End
+**Desktop:**
+ - OS: [e.g. Windows, macOS, Linux]
+ - Browser [e.g. Chrome, Safari, etc.]
+ - Version [e.g. Windows 10, macOS 10.14, Ubuntu Linux 18.04]
+
+**Smartphone: (if applicable):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..ea076d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**A little about you.**
+Describe your use case for hyperglass, the environment on which it runs, the predominant network device type, and any other relevant details.
+
+**Is your feature request related to a problem? Please describe.**
+If yes, a clear and concise description of what the problem is.
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From 0ea42ac68d3dfb01d566c2c6f19a6b4deeb6fa59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Skyler=20M=C3=A4ntysaari?= <samip5@users.noreply.github.com>
Date: Fri, 3 Jul 2020 03:10:01 +0300
Subject: [PATCH 2/5] Issue Templates: Added issue templates back and updated
 them.

---
 .github/ISSUE_TEMPLATE/bug_report.md | 35 ++++++++++++++++++----------
 .github/ISSUE_TEMPLATE/config.yml    |  1 +
 .github/PULL_REQUEST_TEMPLATE.md     | 23 ++++++++++++++++--
 3 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index c17c43b..77456b1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,25 +7,33 @@ assignees: ''
 
 ---
 
-## Information
+<!--- Provide a general summary of the issue in the Title above -->
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+#### Expected behavior
+<!--- Tell us what should happen -->
 
-**To Reproduce**
-Steps to reproduce the behavior.
+#### Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+#### Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+#### Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
 
-## Environment
+## Context (Environment)
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
 ### Back End
 **Server:**
  - OS: [e.g. Ubuntu, CentOS]
+ - Hyperglass Version: [e.g 1.0.0]
  - Python Version: 
  - Reverse Proxy: [e.g. NGINX, Caddy]
  - Redis Version: 
@@ -42,5 +50,8 @@ If applicable, add screenshots to help explain your problem.
  - Browser [e.g. stock browser, safari]
  - Version [e.g. 22]
 
-**Additional context**
-Add any other context about the problem here.
+## Screenshots
+<!--- If applicable, add screenshots to help explain -->
+
+## Possible Implementation
+<!--- Not obligatory, but suggest an idea for implementing addition or change -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..a49eab2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: true
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d9182b5..49ddca5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,22 @@
-<-- Thank you for your interest in contributing to hyperglass. The contribution policy requires that a feature request or bug must be opened prior to a pull request being reviewed. Please list the related feature request or bug below: -->
+<!--- Provide a general summary of your changes in the Title above -->
 
-### Fixes:
+## Description
+<!--- Describe your changes in detail -->
+
+## Related Issue
+<!--- Thank you fro your interest in contributing to hyperglass -->
+<!--- This project only accepts pull requests related to open issues -->
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!--- Please link to the issue here: -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Screenshots (if appropriate):

From e61131a87b15bafd149e6ce6eec89d82111545d0 Mon Sep 17 00:00:00 2001
From: Matt Love <mtt.lov@gmail.com>
Date: Sun, 5 Jul 2020 17:58:16 -0700
Subject: [PATCH 3/5] Update and rename bug_report.md to 2-bug-report.md

Made some structural edits, mainly stealing from [httpx's general structure/comments](https://github.com/encode/httpx/tree/master/.github/ISSUE_TEMPLATE).
---
 .github/ISSUE_TEMPLATE/2-bug-report.md | 51 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/bug_report.md   | 57 --------------------------
 2 files changed, 51 insertions(+), 57 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/2-bug-report.md
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/2-bug-report.md b/.github/ISSUE_TEMPLATE/2-bug-report.md
new file mode 100644
index 0000000..e49015b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-bug-report.md
@@ -0,0 +1,51 @@
+---
+name: Bug Report
+about: Report a problem or unexpected behavior
+labels: bug
+assignees: checktheroads
+---
+
+<!-- Please provide a general summary of the issue in the Title. -->
+
+# Bug Description
+<!-- A clear and concise description of the bug. -->
+
+# Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+# Steps to Reproduce
+<!-- Provide steps necessary to reproduce this issue. -->
+
+## Local Configurations
+<!-- If possible, please a link to a live example and the relevant sections of your hyperglass.yaml, commands.yaml, or devices.yaml in a code block. -->
+
+```
+<configs>
+```
+
+## Logs
+<!-- If an error occurred, please paste the relevant error message(s) in the below code block. -->
+
+```
+<logs>
+```
+
+# Possible Solution
+<!-- If you think you know what would fix this, please share your ideas. -->
+
+# Environment
+
+## Server
+ - OS: <!-- (e.g. Ubuntu 18.04, CentOS 7) -->
+ - Python Version: <!-- (e.g. 3.6) -->
+ - hyperglass Version: <!-- (e.g 1.0.0) -->
+
+## Client
+ - OS & Version: <!-- (e.g. Windows 10, macOS 10.15, Ubuntu Linux 18.04) -->
+ - Browser: <!-- (e.g. Chrome, Safari, Firefox, etc.) -->
+
+### Smartphone Details (if applicable)
+ - Device: <!-- (e.g. iPhone, Samsung) -->
+ - OS: <!-- (e.g. iOS 13.1, Android 11) -->
+ - Browser: <!-- (e.g. Safari, Chrome) -->
+ 
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 77456b1..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-#### Expected behavior
-<!--- Tell us what should happen -->
-
-#### Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-#### Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-
-#### Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context (Environment)
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-### Back End
-**Server:**
- - OS: [e.g. Ubuntu, CentOS]
- - Hyperglass Version: [e.g 1.0.0]
- - Python Version: 
- - Reverse Proxy: [e.g. NGINX, Caddy]
- - Redis Version: 
-
-### Front End
-**Desktop:**
- - OS: [e.g. Windows, macOS, Linux]
- - Browser [e.g. Chrome, Safari, etc.]
- - Version [e.g. Windows 10, macOS 10.14, Ubuntu Linux 18.04]
-
-**Smartphone: (if applicable):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-## Screenshots
-<!--- If applicable, add screenshots to help explain -->
-
-## Possible Implementation
-<!--- Not obligatory, but suggest an idea for implementing addition or change -->
\ No newline at end of file

From b1c24b251a2cd465a11480b1cefd7e0199ab9bc0 Mon Sep 17 00:00:00 2001
From: Matt Love <mtt.lov@gmail.com>
Date: Sun, 5 Jul 2020 18:07:13 -0700
Subject: [PATCH 4/5] Update and rename feature_request.md to
 1-feature-request.md

---
 .github/ISSUE_TEMPLATE/1-feature-request.md | 26 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md   | 20 ----------------
 2 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/1-feature-request.md
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/1-feature-request.md b/.github/ISSUE_TEMPLATE/1-feature-request.md
new file mode 100644
index 0000000..44226d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-feature-request.md
@@ -0,0 +1,26 @@
+---
+name: Feature Request
+about: Suggest an idea for this project
+labels: enhancement
+assignees: checktheroads
+---
+
+<!--
+If the answer to any of these questions is "no", your feature request will most likely be rejected (but will still be considered).
+- Is the new feature only applicable to one Network Operating System (https://hyperglass.io/docs/platforms)?
+- Would the new feature work only on mobile, or only on desktop?
+- Would the new feature only support IPv4, or IPv6?
+- Is the new feature something that can be reasonably customized by hyperglass end-users?
+-->
+
+# Feature Description
+<!-- Describe the solution or change you would like. -->
+
+### Is your feature request related to a problem? Please describe.
+<!-- If yes, a clear and concise description of what the problem is. -->
+
+# Environment & Use Case
+<!-- Describe your use case for hyperglass, the environment on which it runs, the predominant network device type, and any other relevant details. -->
+
+# Additional Context
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index ea076d5..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**A little about you.**
-Describe your use case for hyperglass, the environment on which it runs, the predominant network device type, and any other relevant details.
-
-**Is your feature request related to a problem? Please describe.**
-If yes, a clear and concise description of what the problem is.
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

From 2b43c297344b61d0ab53901b1d9149d2253351dc Mon Sep 17 00:00:00 2001
From: Matt Love <mtt.lov@gmail.com>
Date: Sun, 5 Jul 2020 18:15:21 -0700
Subject: [PATCH 5/5] Update and rename PULL_REQUEST_TEMPLATE.md to
 pull_request_template.md

---
 .github/PULL_REQUEST_TEMPLATE.md | 22 ----------------------
 .github/pull_request_template.md | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/pull_request_template.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 49ddca5..0000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-## Description
-<!--- Describe your changes in detail -->
-
-## Related Issue
-<!--- Thank you fro your interest in contributing to hyperglass -->
-<!--- This project only accepts pull requests related to open issues -->
-<!--- If suggesting a new feature or change, please discuss it in an issue first -->
-<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
-<!--- Please link to the issue here: -->
-
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Screenshots (if appropriate):
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..748a1c7
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,15 @@
+<!-- PLEASE CONSULT CONTRIBUTING.MD PRIOR TO WORKING ON HYPERGLASS -->
+
+<!-- Provide a general summary of your changes in the Title. -->
+
+# Description
+<!-- Describe your changes in detail -->
+
+# Related Issues
+<!-- Link to any related open issues -->
+
+# Motivation and Context
+<!-- Why is this change required? What problem does it solve? -->
+
+# Tests
+<!-- Please describe in detail how you tested your changes, including your testing environment (OS, Python version, etc). -->