diff --git a/appliances/arista-veos.json b/appliances/arista-veos.json index 7f23212..6431fc5 100644 --- a/appliances/arista-veos.json +++ b/appliances/arista-veos.json @@ -1,12 +1,13 @@ { "name": "Arista vEOS", - "category": "router", + "category": "router", + "description": "Arista EOS® is the core of Arista cloud networking solutions for next-generation data centers and cloud networks. Cloud architectures built with Arista EOS scale to tens of thousands of compute and storage nodes with management and provisioning capabilities that work at scale. Through its programmability, EOS enables a set of software applications that deliver workflow automation, high availability, unprecedented network visibility and analytics and rapid integration with a wide range of third-party applications for virtualization, management, automation and orchestration services.\n\nArista Extensible Operating System (EOS) is a fully programmable and highly modular, Linux-based network operation system, using familiar industry standard CLI and runs a single binary software image across the Arista switching family. Architected for resiliency and programmability, EOS has a unique multi-process state sharing architecture that separates state information and packet forwarding from protocol processing and application logic.", "vendor_name": "Arista", "vendor_url": "http://www.arista.com/", "documentation_url": "http://www.arista.com/docs/Manuals/ConfigGuide.pdf", "product_name": "Arista vEOS", - "product_url": "https://eos.arista.com/", - "repository_version": 1, + "product_url": "https://eos.arista.com/", + "registry_version": 1, "status": "stable", "maintainer": "GNS3 Team", "maintainer_email": "developers@gns3.net", diff --git a/appliances/cumulus-vx.json b/appliances/cumulus-vx.json index f91e804..7828aee 100644 --- a/appliances/cumulus-vx.json +++ b/appliances/cumulus-vx.json @@ -1,6 +1,7 @@ { "name": "Cumulus VX", - "category": "router", + "category": "router", + "description": "Cumulus VX is a community-supported virtual appliance that enables cloud admins and network engineers to preview and test Cumulus Networks technology at zero cost. You can build sandbox environments to learn Open Networking concepts, prototype network operations and script & develop applications risk-free. With Cumulus VX, you can get started with Open Networking at your pace, on your time, and in your environment!", "vendor_name": "Cumulus Network", "vendor_url": "https://www.cumulusnetworks.com", "documentation_url": "http://docs.cumulusnetworks.com/", diff --git a/appliances/hp-vsr1001.json b/appliances/hp-vsr1001.json index 2c09f13..9353d57 100644 --- a/appliances/hp-vsr1001.json +++ b/appliances/hp-vsr1001.json @@ -1,12 +1,13 @@ { "name": "HP VSR1001", - "category": "router", + "category": "router", + "description": "The HP VSR1000 Virtual Services Router Series is a software application, running on a server, which provides functionality similar to that of a physical router: robust routing between networked devices using a number of popular routing protocols. It also delivers the critical network services associated with today's enterprise routers such as VPN gateway, firewall and other security and traffic management functions.\n\nThe virtual services router (VSR) application runs on a hypervisor on the server, and supports VMware vSphere and Linux KVM hypervisors. From one to eight virtual CPUs are supported, depending on license.\n\nBecause the VSR1000 Series application runs the same HP Comware version 7 operating system as HP switches and routers, it enables significant operational savings. And being virtual, additional agility and ease of deployment is realized, as resources on the VSR can be dynamically allocated and upgraded upon demand as performance requirements grow.\n\nA variety of deployment models are supported including enterprise branch CPE routing, and cloud offload for small to medium workloads.", "vendor_name": "HP", "vendor_url": "http://www.hp.com", "documentation_url": "http://h20564.www2.hp.com/portal/site/hpsc/public/psi/home/?sp4ts.oid=5443163", "product_name": "VSR1001", "product_url": "http://www8.hp.com/us/en/products/networking-routers/product-detail.html?oid=5443163", - "repository_version": 1, + "registry_version": 1, "status": "broken", "maintainer": "GNS3 Team", "maintainer_email": "developers@gns3.net", diff --git a/appliances/microcore-linux.json b/appliances/microcore-linux.json index 15c31f3..3ba0ab1 100644 --- a/appliances/microcore-linux.json +++ b/appliances/microcore-linux.json @@ -1,6 +1,7 @@ { "name": "Micro Core Linux", "category": "guest", + "description": "Micro Core Linux is a smaller variant of Tiny Core without a graphical desktop.\n\nIt's provide a complete Linux system in few MB.", "vendor_name": "Team Tiny Core", "vendor_url": "http://distro.ibiblio.org/tinycorelinux", "documentation_url": "http://wiki.tinycorelinux.net/", diff --git a/build.py b/build.py index 7c2f508..6baef53 100644 --- a/build.py +++ b/build.py @@ -48,6 +48,7 @@ os.mkdir(os.path.join('build', 'images')) def render(template_file, out, **kwargs): log.info('Build %s', out) env = Environment(loader=FileSystemLoader('templates')) + env.filters['nl2br'] = lambda s: s.replace('\n', '
') env.filters['jsonify'] = json.dumps env.filters['b64encode'] = lambda s: base64.b64encode(s.encode()).decode("utf-8") template = env.get_template(template_file) diff --git a/templates/appliance.html b/templates/appliance.html index 0262f18..7038b6b 100644 --- a/templates/appliance.html +++ b/templates/appliance.html @@ -16,6 +16,13 @@ function download(appliance, md5sum) { {% block body %}
+ {% if appliance["status"] == "broken" %} + + {% endif %}

{{ appliance["name"] }}

Category {{ appliance["category"] }}
Product: {{ appliance["product_name"] }}
@@ -23,15 +30,11 @@ function download(appliance, md5sum) { Documentation: {{ appliance["documentation_url"] }}
Status: {{ appliance["status"] }}
Maintainer: {{ appliance["maintainer"] }} + +

{{ appliance["description"] | nl2br }}

- {% if appliance["status"] == "broken" %} - - {% endif %} + {% if "qemu" in appliance %}

Qemu settings